Rename obsolete tq methods to standard names

(cherry picked from commit 38a31bafc0c0c68b4cb7c0606bac55bbef7c8b69)

4 files changed, 33 insertions, 33 deletions

diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 5298d56..cdd7f45 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
   connect(linstButton,TQT_SIGNAL(clicked()),
 	  TQT_SLOT(installMultClicked()));
 
-  leftbox->addLayout(lbuttons,0); // top level tqlayout as child
+  leftbox->addLayout(lbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   lbuttons->addWidget(linstButton,1,AlignBottom);
   lbuttons->addWidget(luinstButton,1,AlignBottom);
   lbuttons->addStretch(1);
@@ -200,11 +200,11 @@ void managementWidget::setupWidgets()
 	  TQT_SLOT(installSingleClicked()));
 
 
-  // Setup the `right panel' tqlayout
+  // Setup the `right panel' layout
   rightbox->addWidget(packageDisplay,10);
-  rightbox->addLayout(rbuttons,0); // top level tqlayout as child
+  rightbox->addLayout(rbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   rbuttons->addWidget(instButton,1);
   rbuttons->addWidget(uinstButton,1);
   rbuttons->addStretch(1);
@@ -289,7 +289,7 @@ void managementWidget::setupInstButton()
 
 void managementWidget::arrangeWidgets()
 {
-  // this is done automatically by the tqlayout managers
+  // this is done automatically by the layout managers
 }
 
 void managementWidget::tabChanged(int tab)
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 04516dc..9d62f2f 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -102,38 +102,38 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
   connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
   connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
 
-  // Do the tqlayout
-  vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
-  vtqlayout->addWidget(title,0);
+  // Do the layout
+  vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+  vlayout->addWidget(title,0);
 
   {
-    htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
+    hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
 
     {
-      tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
+      layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
 
       packages = new KListView(this);
-      tqlayout->addWidget(packages,20);
+      layout->addWidget(packages,20);
       packages->addColumn(i18n("PACKAGES"),200);
 
       connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
 	    this, TQT_SLOT(slotSearch( TQListViewItem * )));
 
-      tqlayout->addStretch(1);
+      layout->addStretch(1);
       for (i = 0; i < bnumber; i++) {
-	tqlayout->addWidget(Boxs[i],1);
+	layout->addWidget(Boxs[i],1);
       }
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
-      TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
-      stqlayout->addStretch(1);
-      stqlayout->addWidget(Keep, 1);
-      stqlayout->addStretch(1);
+      TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
+      slayout->addStretch(1);
+      slayout->addWidget(Keep, 1);
+      slayout->addStretch(1);
 
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
       TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
-      tqlayout->addLayout(buttons);
+      layout->addLayout(buttons);
 
       buttons->addWidget(installButton,2);
       buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
     }
     {
       term = new kpTerm(kpty,this);
-      htqlayout->addWidget(term, 1000);
+      hlayout->addWidget(term, 1000);
     }
   }
   resize(800, 400);
diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h
index becbc54..12158cd 100644
--- a/kpackage/pkgOptions.h
+++ b/kpackage/pkgOptions.h
@@ -104,8 +104,8 @@ signals:
   void finished(int refresh);
 
 protected:
-  // The tqlayout managers
-  TQBoxLayout *tqlayout, *htqlayout, *vtqlayout;
+  // The layout managers
+  TQBoxLayout *layout, *hlayout, *vlayout;
 
   // Sub widgets
   TQPushButton *installButton;
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 8192083..c662da8 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -272,9 +272,9 @@ void updateLoc::doBase(const TQString & bmsg)
   if (haveBase) {
     fbase = new TQGroupBox(bmsg, this);
     fbase->setColumnLayout(0, Qt::Vertical );
-    fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
-    fbase->tqlayout()->setMargin( KDialog::marginHint() );
-    vbase = new TQVBoxLayout(fbase->tqlayout());
+    fbase->layout()->setSpacing( KDialog::spacingHint() );
+    fbase->layout()->setMargin( KDialog::marginHint() );
+    vbase = new TQVBoxLayout(fbase->layout());
     vf->addWidget(fbase,1);
     base = new dpanel(fbase);
     vbase->addWidget(base,0);
@@ -410,10 +410,10 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons
 
   TQGroupBox *floc = new TQGroupBox(lmsg, this);
   floc->setColumnLayout(0, Qt::Vertical );
-  floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-  floc->tqlayout()->setMargin( KDialog::marginHint() );
+  floc->layout()->setSpacing( KDialog::spacingHint() );
+  floc->layout()->setMargin( KDialog::marginHint() );
   vf->addWidget(floc,1);
-  TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+  TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
   for (int i = 0; i < numLines; i++) {
     dp[i] = new dpanel(base, filter,  subdirs, floc);
@@ -547,10 +547,10 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const
   for (int i = 0; i < numLines; i++) {
     TQGroupBox *floc = new TQGroupBox(*kcIt, this);
     floc->setColumnLayout(0, Qt::Vertical );
-    floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-    floc->tqlayout()->setMargin( KDialog::marginHint() );
+    floc->layout()->setSpacing( KDialog::spacingHint() );
+    floc->layout()->setMargin( KDialog::marginHint() );
     vf->addWidget(floc,1);
-    TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+    TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
     combo[i] = new KComboBox( true, floc);
     KCompletion *comp = combo[i]->completionObject();