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

This reverts commit 6238a41f5d502a181672fdcc235e9977584dfe38.

1 files changed, 32 insertions, 32 deletions

diff --git a/src/kile/mathenvdialog.cpp b/src/kile/mathenvdialog.cpp
index 5a7f3a0..e3b5dce 100644
--- a/src/kile/mathenvdialog.cpp
+++ b/src/kile/mathenvdialog.cpp
@@ -20,7 +20,7 @@
 #include "codecompletion.h"
 #include "kileedit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <tqwhatsthis.h>
@@ -43,8 +43,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	// environment groupbox
 	TQButtonGroup *envgroup = new TQButtonGroup( i18n("Environment"),page);
 	envgroup->setColumnLayout(0, Qt::Vertical );
-	envgroup->layout()->setSpacing( 6 );
-	envgroup->layout()->setMargin( 11 );
+	envgroup->tqlayout()->setSpacing( 6 );
+	envgroup->tqlayout()->setMargin( 11 );
 
 	m_lbEnvironment = new TQLabel(i18n("&Name:"),envgroup);
 	m_lbStarred = new TQLabel(i18n("Without n&umbering:"),envgroup);
@@ -70,28 +70,28 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	m_coDisplaymath = new TQComboBox(envgroup);	
 	m_cbBullets = new TQCheckBox(envgroup);
 	
-	TQGridLayout *envlayout = new TQGridLayout( envgroup->layout() );
-	envlayout->setAlignment( TQt::AlignTop );
-	envlayout->addWidget( m_lbEnvironment, 0,0 ); 
-	envlayout->addWidget( m_lbStarred, 1,0 );
-	envlayout->addWidget( m_lbRows, 2,0 );
-	envlayout->addWidget( m_lbCols, 3,0 );
-	envlayout->addWidget( m_lbTabulator, 5,0 ); 
-	envlayout->addWidget( m_lbDisplaymath, 6,0 ); 
-	envlayout->addWidget( m_coEnvironment, 0,1 );
-	envlayout->addWidget( m_cbStarred, 1,1 );
-	envlayout->addWidget( m_spRows, 2,1 );
-	envlayout->addWidget( m_spCols, 3,1 );
-	envlayout->addWidget( m_coTabulator, 5,1 );
-	envlayout->addWidget( m_coDisplaymath, 6,1 );
-	envlayout->addWidget( m_lbSpace, 3,3 );
-	envlayout->addWidget( m_lbBullets, 5,3 );
-	envlayout->addWidget( m_edSpace, 3,4 );
-	envlayout->addWidget( m_cbBullets, 5,4 );	
-	envlayout->addMultiCellWidget(frame,4,4,0,4);
-	envlayout->setRowSpacing(4,30);
-	envlayout->setColSpacing(2,20);
-	envlayout->setColStretch(4,1);
+	TQGridLayout *envtqlayout = new TQGridLayout( envgroup->tqlayout() );
+	envtqlayout->tqsetAlignment( TQt::AlignTop );
+	envtqlayout->addWidget( m_lbEnvironment, 0,0 ); 
+	envtqlayout->addWidget( m_lbStarred, 1,0 );
+	envtqlayout->addWidget( m_lbRows, 2,0 );
+	envtqlayout->addWidget( m_lbCols, 3,0 );
+	envtqlayout->addWidget( m_lbTabulator, 5,0 ); 
+	envtqlayout->addWidget( m_lbDisplaymath, 6,0 ); 
+	envtqlayout->addWidget( m_coEnvironment, 0,1 );
+	envtqlayout->addWidget( m_cbStarred, 1,1 );
+	envtqlayout->addWidget( m_spRows, 2,1 );
+	envtqlayout->addWidget( m_spCols, 3,1 );
+	envtqlayout->addWidget( m_coTabulator, 5,1 );
+	envtqlayout->addWidget( m_coDisplaymath, 6,1 );
+	envtqlayout->addWidget( m_lbSpace, 3,3 );
+	envtqlayout->addWidget( m_lbBullets, 5,3 );
+	envtqlayout->addWidget( m_edSpace, 3,4 );
+	envtqlayout->addWidget( m_cbBullets, 5,4 );	
+	envtqlayout->addMultiCellWidget(frame,4,4,0,4);
+	envtqlayout->setRowSpacing(4,30);
+	envtqlayout->setColSpacing(2,20);
+	envtqlayout->setColStretch(4,1);
 	
 	// add widgets
 	vbox->addWidget( envgroup);
@@ -125,8 +125,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
 	TQWhatsThis::add(m_coEnvironment,i18n("Choose an environment."));
 	TQWhatsThis::add(m_cbStarred,i18n("Use the starred version of this environment."));
 	TQWhatsThis::add(m_spRows,i18n("Choose the number of table rows."));
-	TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or alignment groups."));
-	TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate alignment groups."));
+	TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or tqalignment groups."));
+	TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate tqalignment groups."));
 	TQWhatsThis::add(m_coTabulator,i18n("Choose one of some predefined tabulators."));
 	TQWhatsThis::add(m_coDisplaymath,i18n("Some environments are only valid in math mode. You can surround them with one of these display math modes."));
 	TQWhatsThis::add(m_cbBullets,i18n("Insert bullets in each cell. Alt+Ctrl+Right and Alt+Ctrl+Left will move very quick from one cell to another."));
@@ -318,8 +318,8 @@ void MathEnvironmentDialog::slotOk()
 			} 
 			else 
 			{
-				displaymathbegin = TQString("\\begin{%1}\n").arg(mathmode);
-				displaymathend   = TQString("\\end{%1}\n").arg(mathmode);
+				displaymathbegin = TQString("\\begin{%1}\n").tqarg(mathmode);
+				displaymathend   = TQString("\\end{%1}\n").tqarg(mathmode);
 			}
 		}
 	}
@@ -329,12 +329,12 @@ void MathEnvironmentDialog::slotOk()
 	
 	TQString parameter;
 	if ( isGroupsParameterEnv() )
-		parameter = TQString("{%2}").arg(numgroups);
+		parameter = TQString("{%2}").tqarg(numgroups);
 	else if ( isParameterEnv() )
 		parameter = '{' + bullet + '}';
 
 	// open environment  
-	m_td.tagBegin += TQString("\\begin{%1}").arg(envname) + parameter + '\n';
+	m_td.tagBegin += TQString("\\begin{%1}").tqarg(envname) + parameter + '\n';
 	
 	for ( int row=0; row<numrows; ++row ) 
 	{
@@ -359,7 +359,7 @@ void MathEnvironmentDialog::slotOk()
 	}
 	
 	// close environment
-	m_td.tagEnd = TQString("\n\\end{%1}\n").arg(envname);
+	m_td.tagEnd = TQString("\n\\end{%1}\n").tqarg(envname);
 	m_td.tagEnd += displaymathend;
 	
 	m_td.dy = ( displaymathbegin.isEmpty() ) ? 1 : 2;