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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 wizards/overviewpage.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'wizards/overviewpage.cpp')

diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index 4ed6c4ac..15df0246 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -21,7 +21,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <kaccelmanager.h>
@@ -43,29 +43,29 @@
 OverViewPage::OverViewPage( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 7, 4, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   const TQString msg = i18n( "KDE Groupware Wizard" );
   TQLabel *label = new TQLabel( "<qt><b><u><h2>" + msg + "</h2></u></b></qt>" , this );
-  layout->addMultiCellWidget( label, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( label, 0, 0, 0, 2 );
 
   label = new TQLabel( this );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "network", KIcon::Desktop ) );
-  layout->addWidget( label, 0, 3 );
+  tqlayout->addWidget( label, 0, 3 );
 
   label = new TQLabel( "", this );
-  layout->addWidget( label, 1, 0 );
-  layout->setRowSpacing( 1, 20 );
+  tqlayout->addWidget( label, 1, 0 );
+  tqlayout->setRowSpacing( 1, 20 );
 
   label = new TQLabel( i18n( "Select the type of server you want connect your KDE to:" ), this );
-  layout->addMultiCellWidget( label, 2, 2, 0, 3 );
+  tqlayout->addMultiCellWidget( label, 2, 2, 0, 3 );
 
   TQPushButton *button;
 
 #ifdef WITH_EGROUPWARE
   button = new TQPushButton( i18n("eGroupware"), this );
-  layout->addMultiCellWidget( button, 3, 3, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 3, 3, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
 #endif
 
@@ -73,33 +73,33 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
 
 #ifdef WITH_KOLAB
   button = new TQPushButton( i18n("Kolab"), this );
-  layout->addMultiCellWidget( button, 4, 4, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 4, 4, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
 #endif
 
 #ifdef WITH_SLOX
   button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
-  layout->addMultiCellWidget( button, 5, 5, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 5, 5, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
 #endif
 
 #ifdef WITH_NEWEXCHANGE
   button = new TQPushButton( i18n("Microsoft Exchange"), this );
   button->hide(); // not quite ready yet
-  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  tqlayout->addMultiCellWidget( button, 6, 6, 0, 3 );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
 #endif
 
   TQFrame *frame = new TQFrame( this );
   frame->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addMultiCellWidget( frame, 7, 7, 0, 3 );
+  tqlayout->addMultiCellWidget( frame, 7, 7, 0, 3 );
 
   TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
-  layout->addWidget( cancelButton, 8, 3 );
+  tqlayout->addWidget( cancelButton, 8, 3 );
 
   connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
 
-  layout->setRowStretch( 7, 1 );
+  tqlayout->setRowStretch( 7, 1 );
 
   KAcceleratorManager::manage( this );
 }
-- 
cgit v1.2.3