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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 18 insertions, 18 deletions

diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 64fbf2f20..4bb6e3700 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
@@ -51,71 +51,71 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                  Ok, parent, name, true ), mAddressee( addr )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page );
-  layout->setSpacing( spacingHint() );
-  layout->addColSpacing( 2, 100 );
+  TQGridLayout *tqlayout = new TQGridLayout( page );
+  tqlayout->setSpacing( spacingHint() );
+  tqlayout->addColSpacing( 2, 100 );
   TQLabel *label;
 
   label = new TQLabel( i18n( "Honorific prefixes:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
   mPrefixCombo = new KComboBox( page );
   mPrefixCombo->setDuplicatesEnabled( false );
   mPrefixCombo->setEditable( true );
   mPrefixCombo->setEnabled( !readOnly );
   label->setBuddy( mPrefixCombo );
-  layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
 
   TQWhatsThis::add( mPrefixCombo, i18n( "The predefined honorific prefixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Given name:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
   mGivenNameEdit = new KLineEdit( page );
   mGivenNameEdit->setReadOnly( readOnly );
   label->setBuddy( mGivenNameEdit );
-  layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
 
   label = new TQLabel( i18n( "Additional names:" ), page );
-  layout->addWidget( label, 2, 0 );
+  tqlayout->addWidget( label, 2, 0 );
   mAdditionalNameEdit = new KLineEdit( page );
   mAdditionalNameEdit->setReadOnly( readOnly );
   label->setBuddy( mAdditionalNameEdit );
-  layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
+  tqlayout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
 
   label = new TQLabel( i18n( "Family names:" ), page );
-  layout->addWidget( label, 3, 0 );
+  tqlayout->addWidget( label, 3, 0 );
   mFamilyNameEdit = new KLineEdit( page );
   mFamilyNameEdit->setReadOnly( readOnly );
   label->setBuddy( mFamilyNameEdit );
-  layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
+  tqlayout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
 
   label = new TQLabel( i18n( "Honorific suffixes:" ), page );
-  layout->addWidget( label, 4, 0 );
+  tqlayout->addWidget( label, 4, 0 );
   mSuffixCombo = new KComboBox( page );
   mSuffixCombo->setDuplicatesEnabled( false );
   mSuffixCombo->setEditable( true );
   mSuffixCombo->setEnabled( !readOnly );
   label->setBuddy( mSuffixCombo );
-  layout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
+  tqlayout->addMultiCellWidget( mSuffixCombo, 4, 4, 1, 2 );
 
   TQWhatsThis::add( mSuffixCombo, i18n( "The predefined honorific suffixes can be extended in the settings dialog." ) );
 
   label = new TQLabel( i18n( "Formatted name:" ), page );
-  layout->addWidget( label, 5, 0 );
+  tqlayout->addWidget( label, 5, 0 );
 
   mFormattedNameCombo = new KComboBox( page );
   mFormattedNameCombo->setEnabled( !readOnly );
-  layout->addWidget( mFormattedNameCombo, 5, 1 );
+  tqlayout->addWidget( mFormattedNameCombo, 5, 1 );
   connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) );
 
   mFormattedNameEdit = new KLineEdit( page );
   mFormattedNameEdit->setEnabled( type == CustomName && !readOnly );
-  layout->addWidget( mFormattedNameEdit, 5, 2 );
+  tqlayout->addWidget( mFormattedNameEdit, 5, 2 );
 
   mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page );
   mParseBox->setEnabled( !readOnly );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) );
   connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) );
-  layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
+  tqlayout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 );
 
   // Fill in the values
   mFamilyNameEdit->setText( addr.familyName() );