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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 23 insertions, 23 deletions

diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 501705e0..3638301d 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -30,7 +30,7 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const char *name )
     : KDialogBase( parent, name , true, i18n("Edit Personal Expression"), Ok|Cancel, Ok, true )
@@ -40,62 +40,62 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch
     setMainWidget(page);
     TQGridLayout* form1Layout = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint(), "form1Layout");
 
-    TQHBoxLayout *horlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout1");
+    TQHBoxLayout *hortqlayout1 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout1");
 
     TQLabel *groupnameLabel = new TQLabel(i18n("Group name:"), page, "groupnameLabel" );
-    horlayout1->addWidget( groupnameLabel );
+    hortqlayout1->addWidget( groupnameLabel );
 
     m_groupLineEdit = new TQLineEdit( page, "groupLineEdit" );
-    horlayout1->addWidget( m_groupLineEdit );
+    hortqlayout1->addWidget( m_groupLineEdit );
 
-    form1Layout->addLayout( horlayout1, 0, 1 );
+    form1Layout->addLayout( hortqlayout1, 0, 1 );
 
     TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" );
-    expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) );
+    expressionGroupBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) );
     expressionGroupBox->setTitle( i18n( "Expressions" ) );
     expressionGroupBox->setColumnLayout(0, Qt::Vertical );
-    expressionGroupBox->layout()->setSpacing( KDialog::spacingHint() );
-    expressionGroupBox->layout()->setMargin( KDialog::marginHint() );
-    TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->layout() );
-    expressionGroupBoxLayout->setAlignment( TQt::AlignTop );
+    expressionGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+    expressionGroupBox->tqlayout()->setMargin( KDialog::marginHint() );
+    TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->tqlayout() );
+    expressionGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
 
     m_ExpressionsList = new TQListBox( expressionGroupBox, "listOfExpressions" );
-    m_ExpressionsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) );
+    m_ExpressionsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 1, 0, m_ExpressionsList->sizePolicy().hasHeightForWidth() ) );
     expressionGroupBoxLayout->addWidget( m_ExpressionsList );
 
     m_expressionLineEdit = new TQLineEdit( expressionGroupBox, "expressionLineEdit" );
     expressionGroupBoxLayout->addWidget( m_expressionLineEdit );
 
-    TQHBoxLayout *horlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout2");
+    TQHBoxLayout *hortqlayout2 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout2");
     TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    horlayout2->addItem( spacer );
+    hortqlayout2->addItem( spacer );
 
     m_addExpression = new TQPushButton( i18n("&New"), expressionGroupBox, "m_addExpression" );
-    horlayout2->addWidget( m_addExpression );
+    hortqlayout2->addWidget( m_addExpression );
 
     m_delExpression = new TQPushButton( i18n("&Delete"), expressionGroupBox, "m_delExpression" );
-    horlayout2->addWidget( m_delExpression );
-    expressionGroupBoxLayout->addLayout( horlayout2 );
+    hortqlayout2->addWidget( m_delExpression );
+    expressionGroupBoxLayout->addLayout( hortqlayout2 );
 
     form1Layout->addWidget( expressionGroupBox, 1, 1 );
 
-    TQVBoxLayout *vertlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "vertlayout");
+    TQVBoxLayout *verttqlayout = new TQVBoxLayout( 0, 0, KDialog::spacingHint(), "verttqlayout");
 
     m_groupList = new TQListBox( page, "groupList" );
     m_groupList->insertItem( "group1"  );
     m_groupList->setMaximumSize( TQSize( 200, 32767 ) );
-    vertlayout->addWidget( m_groupList );
+    verttqlayout->addWidget( m_groupList );
 
-    TQHBoxLayout *horlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "horlayout3");
+    TQHBoxLayout *hortqlayout3 = new TQHBoxLayout( 0, 0, KDialog::spacingHint(), "hortqlayout3");
 
     m_addGroup = new TQPushButton( i18n("New"), page, "m_addGroup" );
-    horlayout3->addWidget( m_addGroup );
+    hortqlayout3->addWidget( m_addGroup );
 
     m_delGroup = new TQPushButton(i18n("Delete"), page, "m_delGroup" );
-    horlayout3->addWidget( m_delGroup );
-    vertlayout->addLayout( horlayout3 );
+    hortqlayout3->addWidget( m_delGroup );
+    verttqlayout->addLayout( hortqlayout3 );
 
-    form1Layout->addMultiCellLayout( vertlayout, 0, 1, 0, 0 );
+    form1Layout->addMultiCellLayout( verttqlayout, 0, 1, 0, 0 );
 
     loadFile();
     if(listExpression.count() == 0)