1 files changed, 16 insertions, 16 deletions

diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 9ee21416d..b2e2bc73d 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -329,7 +329,7 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList
       /*parent*/ 0, "", true ), pluginOffers( offers )
 {
   TQWidget *back = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( back, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( back, 0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "&Available sources:" ), back );
   chooser = new TQComboBox( false, back );
@@ -354,10 +354,10 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( KTrader::OfferList
   connect( chooser, TQT_SIGNAL( activated( int ) ),
            this, TQT_SLOT( pluginChanged( int ) ) );
 
-  tqlayout->addWidget( label );
-  tqlayout->addWidget( chooser );
-  tqlayout->addWidget( descriptionLabel );
-  tqlayout->addStretch( 1 );
+  layout->addWidget( label );
+  layout->addWidget( chooser );
+  layout->addWidget( descriptionLabel );
+  layout->addStretch( 1 );
 
   pluginChanged( 0 );
 }
@@ -387,41 +387,41 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat
 {
     db_=db;
     TQWidget *back = plainPage();
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(back);
+    TQVBoxLayout *layout=new TQVBoxLayout(back);
 //    TQVBox *back = new TQVBox( page );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    layout->setSpacing( KDialog::spacingHint() );
 
 //    TQVBox *row1 = new TQVBox( back );
 //    row1->setSpacing( KDialog::spacingHint() );
 
     TQLabel *l = new TQLabel( i18n( "Datasource:" ),back );
 //    l->setMaximumHeight( l->sizeHint().height() );
-    tqlayout->addWidget(l);
+    layout->addWidget(l);
 
     TQHBox *row1=new TQHBox(back);
-    tqlayout->addWidget(row1);
+    layout->addWidget(row1);
     row1->setSpacing( KDialog::spacingHint() );
     edit=new TQPushButton(i18n("Edit Current..."),row1);
     create=new TQPushButton(i18n("Create New..."),row1);
     open=new TQPushButton(i18n("Open Existing..."),row1);
 
     KSeparator *separator1 = new KSeparator(back);
-    tqlayout->addWidget(separator1);
+    layout->addWidget(separator1);
 
     l = new TQLabel( i18n( "Merging:" ),back );
-    tqlayout->addWidget(l);
+    layout->addWidget(l);
 //  l->setMaximumHeight( l->sizeHint().height() );
     TQHBox *row2=new TQHBox(back);
-    tqlayout->addWidget(row2);
+    layout->addWidget(row2);
     row2->setSpacing( KDialog::spacingHint() );
     preview=new TQPushButton(i18n("Print Preview..."),row2);
     document=new TQPushButton(i18n("Create New Document"),row2);
     document->hide();
     (void) new TQWidget(row2);
-    tqlayout->addStretch();
+    layout->addStretch();
 
     KSeparator *separator2 = new KSeparator(back);
-    tqlayout->addWidget(separator2);
+    layout->addWidget(separator2);
 
     enableDisableEdit();
 
@@ -516,8 +516,8 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW
   m_db=db;
   TQWidget *page = plainPage();
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
-  tqlayout->setAutoAdd( true );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  layout->setAutoAdd( true );
 
   TQLabel *l = new TQLabel( i18n( "Name:" ), page );
   l->setMaximumHeight( l->sizeHint().height() );