Rename obsolete tq methods to standard names

32 files changed, 196 insertions, 196 deletions

diff --git a/kcron/ktprint.h b/kcron/ktprint.h
index b035626..16c13b1 100644
--- a/kcron/ktprint.h
+++ b/kcron/ktprint.h
@@ -178,7 +178,7 @@ private:
   KPrinter *prnt;
 
 /**
-  *Nest a column class to make text tqlayout nicer
+  *Nest a column class to make text layout nicer
   */
 
   class Column {
diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp
index 474d22c..84080ad 100644
--- a/kcron/ktvariable.cpp
+++ b/kcron/ktvariable.cpp
@@ -27,18 +27,18 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
   ctvar( _ctvar)
 {
   TQFrame *page = makeMainWidget();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
-  tqlayout->setRowStretch(3, 1);
-  tqlayout->setColStretch(1, 1);
+  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 0, spacingHint() );
+  layout->setRowStretch(3, 1);
+  layout->setColStretch(1, 1);
 
   setIcon(KTIcon::application(true));
 
   // variable
   labVariable = new TQLabel(i18n("&Variable:"), page, "labVariable");
-  tqlayout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labVariable, 1, 0, TQt::AlignLeft | TQt::AlignTop);
 
   cmbVariable = new TQComboBox(true, page, "cmbVariable");
-  tqlayout->addWidget(cmbVariable, 1, 1);
+  layout->addWidget(cmbVariable, 1, 1);
 
   cmbVariable->insertItem("HOME");
   cmbVariable->insertItem("MAILTO");
@@ -49,30 +49,30 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) :
 
   // icon
   labIcon = new TQLabel(page, "labIcon");
-  tqlayout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
+  layout->addMultiCellWidget(labIcon, 0, 1, 2, 2);
 
   // value
   labValue = new TQLabel(i18n("Va&lue:"), page, "labValue");
-  tqlayout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labValue, 2, 0, TQt::AlignLeft | TQt::AlignTop);
 
   leValue = new TQLineEdit(page, "leValue");
-  tqlayout->addMultiCellWidget(leValue, 2, 2, 1, 2);
+  layout->addMultiCellWidget(leValue, 2, 2, 1, 2);
   leValue->setMaxLength(255);
   labValue->setBuddy(leValue);
 
   // comment
   labComment = new TQLabel(i18n("Co&mment:"), page, "labComment");
-  tqlayout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
+  layout->addWidget(labComment, 3, 0, TQt::AlignLeft | TQt::AlignTop);
 
   teComment = new KTextEdit(page, "teComment");
   teComment->setTextFormat(TQt::PlainText);
-  tqlayout->addMultiCellWidget(teComment, 3, 3, 1, 2);
+  layout->addMultiCellWidget(teComment, 3, 3, 1, 2);
 
   labComment->setBuddy(teComment);
 
   // enabled
   chkEnabled = new TQCheckBox(i18n("&Enabled"), page, "chkEnabled");
-  tqlayout->addWidget(chkEnabled, 4, 0);
+  layout->addWidget(chkEnabled, 4, 0);
 
   // set starting field values
   cmbVariable->setEditText(TQString::fromLocal8Bit(ctvar->variable.c_str()));
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index cfc0610..035a1c1 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -549,7 +549,7 @@ void SelectableNode::paintText( TQPainter* p, int indent, int cellHeight,
 			       p->fontMetrics().leading()) / 2);
     if (highlighted) {
 	paintHighlight(p, indent, cg, owner->hasFocus(),
-                (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+                (TQt::GUIStyle)owner->style().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
 	p->setPen(cg.base());
 	p->setBackgroundColor(cg.text());
     }
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index f4c96a6..c5c9583 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -22,7 +22,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -33,7 +33,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -128,7 +128,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp
index df68b3d..24712d4 100644
--- a/kdat/ktreeview.cpp
+++ b/kdat/ktreeview.cpp
@@ -372,7 +372,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight,
 			       p->fontMetrics().leading()) / 2);
     if (highlighted) {
 	paintHighlight(p, indent, cg, owner->hasFocus(),
-                       (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
+                       (TQt::GUIStyle)owner->style().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;)
 	p->setPen(cg.base());
 	p->setBackgroundColor(cg.text());
     }
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index 361f893..d68dffe 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -58,7 +58,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name)
     kpbCancel->setText( i18n( "&Cancel" ) );
     TQToolTip::add( kpbCancel, i18n( "Forget changes" ) );
 
-    //Creat and add the KAddDeviceDlg widget to the main tqlayout
+    //Creat and add the KAddDeviceDlg widget to the main layout
     addDlg = new KAddDeviceDlg(this);
     mainLayout->addWidget(addDlg);
     mainLayout->setResizeMode(TQLayout::Auto);
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 34f1ccb..c111143 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout25</cstring>
+                        <cstring>layout25</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
index e4ad380..af91fc8 100644
--- a/knetworkconf/knetworkconf/kdetectdistrodlg.ui
+++ b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
index 21db184..7e2a4da 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -71,7 +71,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout16</cstring>
+                            <cstring>layout16</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -177,7 +177,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -462,7 +462,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -534,7 +534,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout25</cstring>
+                                    <cstring>layout25</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -669,7 +669,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout20</cstring>
+                                    <cstring>layout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -807,7 +807,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout28</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
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();
diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index efd1878..1f8d454 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -856,7 +856,7 @@ void KSVContent::pasteAppend()
     {
 	  KSVData data;
 
-	  if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+	  if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
 		{
 		  KSVAction* action = 0L;
 
@@ -1074,10 +1074,10 @@ void KSVContent::calcMinSize ()
       h = kMax (h, mRunlevels[i]->sizeHint().height());
     }
 
-  mContent->tqlayout()->setEnabled(false);
+  mContent->layout()->setEnabled(false);
   mContent->setMinimumSize(mMinSize);
   mScroller->updateScrollBars();
-  mContent->tqlayout()->setEnabled(true);
+  mContent->layout()->setEnabled(true);
 }
 
 void KSVContent::mergeLoadedPackage (TQValueList<KSVData>* start,
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 5530f97..181a717 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -508,7 +508,7 @@ void KSVTopLevel::editCut() {
   if (list && list->currentItem())
 	{
 	  KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 
 	  KSVData data = *list->currentItem()->data();
 	  delete list->currentItem();
@@ -525,7 +525,7 @@ void KSVTopLevel::editCopy()
   if (list)
 	{
 	  KSVDrag* mime = new KSVDrag (*static_cast<KSVItem*> (list->currentItem()), 0L, 0L);
-	  kapp->tqclipboard()->setData (mime);
+	  kapp->clipboard()->setData (mime);
 	}
 }
 
@@ -537,7 +537,7 @@ void KSVTopLevel::editPaste()
     {
 	  KSVData data;
 
-	  if (KSVDrag::decodeNative (kapp->tqclipboard()->data(), data))
+	  if (KSVDrag::decodeNative (kapp->clipboard()->data(), data))
 		{
 		  KSVAction* action = 0L;
 
@@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit ()
 	}
   else
 	{
-	  TQMimeSource* mime = kapp->tqclipboard()->data();
+	  TQMimeSource* mime = kapp->clipboard()->data();
 
 	  if (mime && mime->provides ("application/x-ksysv"))
 		setPaste (true);
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index f79e521..59a5a3a 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -88,7 +88,7 @@ TQSize KScroller::minimumSizeHint() const
 TQSize KScroller::sizeHint() const
 {
   TQSize size = mContent->minimumSize();
-  int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+  int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
   size += TQSize( extra, extra );
   return size;
 }
@@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h)
 
   if (cw > w)
     {
-      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       if (!mVertical->isHidden())
         w -= extra;
@@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h)
 
   if (ch > h)
     {
-      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
       mVertical->setRange (0, ch - h);
       mVertical->setPageStep (h);
       mVertical->setLineStep (25);
@@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h)
 {
   if (!mVertical->isHidden() && !mHorizontal->isHidden())
     {
-      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       mCornerWidget->raise();
       mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);
diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 8021f9e..24181b9 100644
--- a/kuser/addUser.cpp
+++ b/kuser/addUser.cpp
@@ -50,7 +50,7 @@ addUser::addUser( KU::KUser *AUser, bool useprivategroup,
   createhome->setChecked(true);
   copyskel = new TQCheckBox(i18n("Copy skeleton"), group);
   connect(createhome, TQT_SIGNAL(toggled(bool)), copyskel, TQT_SLOT(setEnabled(bool)));
-  fronttqlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
+  frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
 
   if ( useprivategroup ) pbprigr->setEnabled( false );
 }
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index afb0da3..02fce6f 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -51,7 +51,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   rid.rid = 514; rid.name = i18n("Domain Guests"); rid.desc = i18n("Guests"); mRids.append( rid );
 
   TQFrame *page = makeMainWidget();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
   TQLabel *lb;
 
   lb = new TQLabel( page );
@@ -64,8 +64,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   legid->setEnabled( mAdd );
   legid->setReadOnly( ro );
   lb->setBuddy( legid );
-  tqlayout->addWidget( lb, 0, 0 );
-  tqlayout->addMultiCellWidget( legid, 0, 0, 1, 2 );
+  layout->addWidget( lb, 0, 0 );
+  layout->addMultiCellWidget( legid, 0, 0, 1, 2 );
 
   if ( mSamba ) {
     lb = new TQLabel( page );
@@ -82,8 +82,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     lerid->setEnabled( mAdd );
     connect( lerid, TQT_SIGNAL(activated(int)), TQT_SLOT(ridSelected(int)) );
     lb->setBuddy( lerid );
-    tqlayout->addWidget( lb, 1, 0 );
-    tqlayout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
+    layout->addWidget( lb, 1, 0 );
+    layout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
   }
 
   lb = new TQLabel( page );
@@ -96,8 +96,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   legrpname->setReadOnly( ro );
   legrpname->setFocus();
   lb->setBuddy( legrpname );
-  tqlayout->addWidget( lb, 2, 0 );
-  tqlayout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
+  layout->addWidget( lb, 2, 0 );
+  layout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
 
   if ( mSamba ) {
     lb = new TQLabel( page );
@@ -106,8 +106,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledesc->setText( kg->getDesc() );
     ledesc->setReadOnly( ro );
     lb->setBuddy( ledesc );
-    tqlayout->addWidget( lb, 3, 0 );
-    tqlayout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
+    layout->addWidget( lb, 3, 0 );
+    layout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Display name:"));
@@ -115,8 +115,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledispname->setText( kg->getDisplayName() );
     ledispname->setReadOnly( ro );
     lb->setBuddy( ledispname );
-    tqlayout->addWidget( lb, 4, 0 );
-    tqlayout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
+    layout->addWidget( lb, 4, 0 );
+    layout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Type:"));
@@ -136,8 +136,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
         break;
     }
     lb->setBuddy( letype );
-    tqlayout->addWidget( lb, 5, 0 );
-    tqlayout->addMultiCellWidget( letype, 5, 5, 1, 2 );
+    layout->addWidget( lb, 5, 0 );
+    layout->addMultiCellWidget( letype, 5, 5, 1, 2 );
 
     lb = new TQLabel( page );
     lb->setText(i18n("Domain SID:"));
@@ -145,11 +145,11 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
     ledomsid->setText( sid.getDOM() );
     ledomsid->setReadOnly( ro );
     lb->setBuddy( ledomsid );
-    tqlayout->addWidget( lb, 6, 0 );
-    tqlayout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
+    layout->addWidget( lb, 6, 0 );
+    layout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
 
     cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page );
-    tqlayout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
+    layout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledesc, TQT_SLOT(setDisabled(bool)) );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledispname, TQT_SLOT(setDisabled(bool)) );
     connect( cbsamba, TQT_SIGNAL(toggled(bool)), letype, TQT_SLOT(setDisabled(bool)) );
@@ -162,18 +162,18 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add,
   m_list_in->setFullWidth(true); // Single column, full widget width.
   m_list_in->addColumn(i18n("Users in Group"));
   m_list_in->setSelectionMode( TQListView::Extended );
-  tqlayout->addWidget( m_list_in, 8, 0 );
+  layout->addWidget( m_list_in, 8, 0 );
 
   TQVBox *vbox = new TQVBox(page);
   TQPushButton *btadd = new TQPushButton(i18n("Add <-"), vbox);
   TQPushButton *btdel = new TQPushButton(i18n("Remove ->"), vbox);
-  tqlayout->addWidget( vbox, 8, 1 );
+  layout->addWidget( vbox, 8, 1 );
 
   m_list_notin = new KListView(page);
   m_list_notin->setFullWidth(true); // Single column, full widget width.
   m_list_notin->addColumn(i18n("Users NOT in Group"));
   m_list_notin->setSelectionMode(TQListView::Extended);
-  tqlayout->addWidget( m_list_notin, 8, 2 );
+  layout->addWidget( m_list_notin, 8, 2 );
 //  TQString whatstr = i18n("Select the users that should be in this kg->");
 //  TQWhatsThis::add(m_list, whatstr);
 //  connect(this,TQT_SIGNAL(okClicked(void)),
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index 8c6eb91..2efcab5 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -155,7 +155,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 578894a..7dff3a1 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -40,7 +40,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -220,7 +220,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index fa24b2a..6466874 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index cc662be..e14a809 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index e1fb80e..1a375c5 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -38,38 +38,38 @@
 #include "kglobal_.h"
 #include "misc.h"
 
-void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
+void propdlg::addRow(TQWidget *parent, TQGridLayout *layout, int row,
   TQWidget *widget, const TQString &label, const TQString &what,
   bool two_column, bool nochange)
 {
    TQLabel *lab = new TQLabel(widget, label, parent);
    lab->setMinimumSize(lab->sizeHint());
    widget->setMinimumSize(widget->sizeHint());
-   tqlayout->addWidget(lab, row, 0);
+   layout->addWidget(lab, row, 0);
    if (!what.isEmpty())
    {
       TQWhatsThis::add(lab, what);
       TQWhatsThis::add(widget, what);
    }
    if (two_column)
-      tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
+      layout->addMultiCellWidget(widget, row, row, 1, 2);
    else
-      tqlayout->addWidget(widget, row, 1);
+      layout->addWidget(widget, row, 1);
 
    if ( !nochange || ro ) return;
    TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-   tqlayout->addWidget( nc, row, 3 );
+   layout->addWidget( nc, row, 3 );
    nc->hide();
    mNoChanges[ widget ] = nc;
 }
 
-KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int row,
+KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int row,
   const TQString &title, bool never)
 {
     KIntSpinBox *days;
 
     TQLabel *label = new TQLabel( title, parent );
-    tqlayout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
+    layout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
 
     days = new KIntSpinBox( parent );
     label->setBuddy( days );
@@ -84,12 +84,12 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int
     {
       days->setMinValue( 0 );
     }
-    tqlayout->addWidget( days, row, 2 );
+    layout->addWidget( days, row, 2 );
 
     connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
 
     TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-    tqlayout->addWidget( nc, row, 3 );
+    layout->addWidget( nc, row, 3 );
     nc->hide();
     mNoChanges[ days ] = nc;
 
@@ -105,44 +105,44 @@ void propdlg::initDlg()
   // Tab 1: User Info
   {
     TQFrame *frame = addPage(i18n("User Info"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     frontpage = frame;
-    fronttqlayout = tqlayout;
+    frontlayout = layout;
 
     lbuser = new TQLabel(frame);
 //    whatstr = i18n("WHAT IS THIS: User login");
-    addRow(frame, tqlayout, row++, lbuser, i18n("User login:"), whatstr, false, false);
+    addRow(frame, layout, row++, lbuser, i18n("User login:"), whatstr, false, false);
 
     leid = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: User Id");
     leid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
-    addRow(frame, tqlayout, row++, leid, i18n("&User ID:"), whatstr);
+    addRow(frame, layout, row++, leid, i18n("&User ID:"), whatstr);
     connect(leid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     if ( !ro ) {
       pbsetpwd = new TQPushButton(i18n("Set &Password..."), frame);
-      tqlayout->addWidget(pbsetpwd, 0, 2);
+      layout->addWidget(pbsetpwd, 0, 2);
       connect(pbsetpwd, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpwd()));
     }
 
 
     lefname = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Full Name");
-    addRow(frame, tqlayout, row++, lefname, i18n("Full &name:"), whatstr);
+    addRow(frame, layout, row++, lefname, i18n("Full &name:"), whatstr);
     connect(lefname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
     lefname->setFocus();
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) {
       lesurname = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Surname");
-      addRow(frame, tqlayout, row++, lesurname, i18n("Surname:"), whatstr);
+      addRow(frame, layout, row++, lesurname, i18n("Surname:"), whatstr);
       connect(lesurname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
       lemail = new KLineEdit(frame);
 //    whatstr = i18n("WHAT IS THIS: Email");
-      addRow(frame, tqlayout, row++, lemail, i18n("Email address:"), whatstr);
+      addRow(frame, layout, row++, lemail, i18n("Email address:"), whatstr);
       connect(lemail, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
     }
 
@@ -156,12 +156,12 @@ void propdlg::initDlg()
     connect(leshell, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(changed()));
     connect(leshell, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Login Shell");
-    addRow(frame, tqlayout, row++, leshell, i18n("&Login shell:"), whatstr);
+    addRow(frame, layout, row++, leshell, i18n("&Login shell:"), whatstr);
 
     lehome = new KLineEdit(frame);
     connect(lehome, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Home Directory");
-    addRow(frame, tqlayout, row++, lehome, i18n("&Home folder:"), whatstr);
+    addRow(frame, layout, row++, lehome, i18n("&Home folder:"), whatstr);
 
     // FreeBSD appears to use the comma separated fields in the GECOS entry
     // differently than Linux.
@@ -169,47 +169,47 @@ void propdlg::initDlg()
       leoffice = new KLineEdit(frame);
       connect(leoffice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office");
-      addRow(frame, tqlayout, row++, leoffice, i18n("&Office:"), whatstr);
+      addRow(frame, layout, row++, leoffice, i18n("&Office:"), whatstr);
 
       leophone = new KLineEdit(frame);
       connect(leophone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office Phone");
-      addRow(frame, tqlayout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
+      addRow(frame, layout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
 
       lehphone = new KLineEdit(frame);
       connect(lehphone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Home Phone");
-      addRow(frame, tqlayout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
+      addRow(frame, layout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
 
       leclass = new KLineEdit(frame);
       connect(leclass, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Login class");
-      addRow(frame, tqlayout, row++, leclass, i18n("Login class:"), whatstr, true);
+      addRow(frame, layout, row++, leclass, i18n("Login class:"), whatstr, true);
     } else {
       leoffice1 = new KLineEdit(frame);
       connect(leoffice1, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office1");
-      addRow(frame, tqlayout, row++, leoffice1, i18n("&Office #1:"), whatstr);
+      addRow(frame, layout, row++, leoffice1, i18n("&Office #1:"), whatstr);
 
       leoffice2 = new KLineEdit(frame);
       connect(leoffice2, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Office2");
-      addRow(frame, tqlayout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
+      addRow(frame, layout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
 
       leaddress = new KLineEdit(frame);
       connect(leaddress, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 //    whatstr = i18n("WHAT IS THIS: Address");
-      addRow(frame, tqlayout, row++, leaddress, i18n("&Address:"), whatstr);
+      addRow(frame, layout, row++, leaddress, i18n("&Address:"), whatstr);
     }
     cbdisabled = new TQCheckBox(frame);
     connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-    addRow(frame, tqlayout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
+    addRow(frame, layout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Disable_POSIX ) {
       cbposix = new TQCheckBox(frame);
       connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
       connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbposixChanged()));
-      addRow(frame, tqlayout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
+      addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
     } else {
       cbposix = 0;
     }
@@ -222,40 +222,40 @@ void propdlg::initDlg()
 
   // Tab 2 : Password Management
     TQFrame *frame = addPage(i18n("Password Management"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     TQDateTime time;
     leslstchg = new TQLabel(frame);
-    addRow(frame, tqlayout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
+    addRow(frame, layout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
 
-    tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+    layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
     row++;
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow ) {
-      tqlayout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
-      lesmin = addDaysGroup(frame, tqlayout, row++, i18n("Time before password may &not be changed after last password change:"), false);
-      lesmax = addDaysGroup(frame, tqlayout, row++, i18n("Time when password &expires after last password change:") );
-      leswarn = addDaysGroup(frame, tqlayout, row++, i18n("Time before password expires to &issue an expire warning:"));
-      lesinact = addDaysGroup(frame, tqlayout, row++, i18n("Time when account will be &disabled after expiration of password:"));
-      tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+      layout->addWidget( new TQLabel( i18n("POSIX parameters:"), frame ), row++, 0 );
+      lesmin = addDaysGroup(frame, layout, row++, i18n("Time before password may &not be changed after last password change:"), false);
+      lesmax = addDaysGroup(frame, layout, row++, i18n("Time when password &expires after last password change:") );
+      leswarn = addDaysGroup(frame, layout, row++, i18n("Time before password expires to &issue an expire warning:"));
+      lesinact = addDaysGroup(frame, layout, row++, i18n("Time when account will be &disabled after expiration of password:"));
+      layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
       row++;
     }
     /*
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
-      tqlayout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
-      tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+      layout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
+      layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
       row++;
     }
     */
     TQLabel *label = new TQLabel( i18n("&Account will expire on:"), frame );
-    tqlayout->addWidget( label, row, 0 );
+    layout->addWidget( label, row, 0 );
     lesexpire = new KDateTimeWidget( frame );
     label->setBuddy( lesexpire );
-    tqlayout->addMultiCellWidget( lesexpire, row, row, 1, 2);
+    layout->addMultiCellWidget( lesexpire, row, row, 1, 2);
 
     cbexpire = new TQCheckBox( i18n("Never"), frame );
-    tqlayout->addWidget( cbexpire, row++, 3 );
+    layout->addWidget( cbexpire, row++, 3 );
 
     connect( lesexpire, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(changed()) );
     connect( cbexpire, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) );
@@ -265,60 +265,60 @@ void propdlg::initDlg()
   // Tab 3: Samba
   if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
     TQFrame *frame = addPage(i18n("Samba"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
     int row = 0;
 
     lerid = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Rid");
     lerid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame)));
-    addRow(frame, tqlayout, row++, lerid, i18n("RID:"), whatstr);
+    addRow(frame, layout, row++, lerid, i18n("RID:"), whatstr);
     connect(lerid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leliscript = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leliscript, i18n("Login script:"), whatstr);
+    addRow(frame, layout, row++, leliscript, i18n("Login script:"), whatstr);
     connect(leliscript, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leprofile = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leprofile, i18n("Profile path:"), whatstr);
+    addRow(frame, layout, row++, leprofile, i18n("Profile path:"), whatstr);
     connect(leprofile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     lehomedrive = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, lehomedrive, i18n("Home drive:"), whatstr);
+    addRow(frame, layout, row++, lehomedrive, i18n("Home drive:"), whatstr);
     connect(lehomedrive, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     lehomepath = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, lehomepath, i18n("Home path:"), whatstr);
+    addRow(frame, layout, row++, lehomepath, i18n("Home path:"), whatstr);
     connect(lehomepath, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     leworkstations = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, leworkstations, i18n("User workstations:"), whatstr);
+    addRow(frame, layout, row++, leworkstations, i18n("User workstations:"), whatstr);
     connect(leworkstations, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     ledomain = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, ledomain, i18n("Domain name:"), whatstr);
+    addRow(frame, layout, row++, ledomain, i18n("Domain name:"), whatstr);
     connect(ledomain, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     ledomsid = new KLineEdit(frame);
 //  whatstr = i18n("WHAT IS THIS: Login script");
-    addRow(frame, tqlayout, row++, ledomsid, i18n("Domain SID:"), whatstr);
+    addRow(frame, layout, row++, ledomsid, i18n("Domain SID:"), whatstr);
     connect(ledomsid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
 
     cbsamba = new TQCheckBox(frame);
     connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
     connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbsambaChanged()));
-    addRow(frame, tqlayout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
+    addRow(frame, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
   }
 
   // Tab 4: Groups
   {
     TQFrame *frame = addPage(i18n("Groups"));
-    TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
+    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
 
     lstgrp = new KListView(frame);
     lstgrp->setFullWidth(true); // Single column, full widget width.
@@ -326,12 +326,12 @@ void propdlg::initDlg()
     if ( ro ) lstgrp->setSelectionMode( TQListView::NoSelection );
 //    TQString whatstr = i18n("Select the groups that this user belongs to.");
     TQWhatsThis::add(lstgrp, whatstr);
-    tqlayout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
+    layout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
     leprigr = new TQLabel( i18n("Primary group: "), frame );
-    tqlayout->addWidget( leprigr, 1, 0 );
+    layout->addWidget( leprigr, 1, 0 );
     if ( !ro ) {
       pbprigr = new TQPushButton( i18n("Set as Primary"), frame );
-      tqlayout->addWidget( pbprigr, 1, 1 );
+      layout->addWidget( pbprigr, 1, 1 );
       connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) );
     }
     connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) );
diff --git a/kuser/propdlg.h b/kuser/propdlg.h
index d4fa163..4dca3ba 100644
--- a/kuser/propdlg.h
+++ b/kuser/propdlg.h
@@ -70,7 +70,7 @@ protected:
   bool check();
   void loadgroups( bool fixedprivgroup );
   bool checkShell(const TQString &shell);
-  void addRow( TQWidget *parent, TQGridLayout *tqlayout, int row, 
+  void addRow( TQWidget *parent, TQGridLayout *layout, int row, 
   TQWidget *widget, const TQString &label, const TQString &what, 
   bool two_column=true, bool nochange=true );
   void setLE( KLineEdit *le, const TQString &val, bool first );
@@ -79,11 +79,11 @@ protected:
   TQString mergeLE( KLineEdit *le, const TQString &val, bool one );
   int mergeSB( KIntSpinBox *sb, int val, bool one );
 
-  KIntSpinBox *addDaysGroup( TQWidget  *parent, TQGridLayout *tqlayout, int row, 
+  KIntSpinBox *addDaysGroup( TQWidget  *parent, TQGridLayout *layout, int row, 
     const TQString &title, bool never=true );
 
   TQFrame *frontpage;
-  TQGridLayout *fronttqlayout;
+  TQGridLayout *frontlayout;
   int frontrow;
 
   TQPtrList<KU::KUser> mUsers;
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index 7140fd9..d74b6b6 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -34,9 +34,9 @@
 Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
+	layout=new TQHBoxLayout(this);
 	edit=new TQMultiLineEdit(this);
-	tqlayout->addWidget(edit);
+	layout->addWidget(edit);
 	connect(edit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(edit, _("You can edit the lilo.conf file directly here. All changes you make here are automatically transferred to the graphical interface."));
 	update();
diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h
index c2971a1..43c5b01 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -48,7 +48,7 @@ signals:
 	void configChanged();
 private:
 	liloconf	*lilo;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQMultiLineEdit	*edit;
 };
 #endif
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index e67dc1f..2040025 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -38,9 +38,9 @@
 General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	TQHBox *drv=new TQHBox(this);
 	TQLabel *drive_lbl=new TQLabel(_("Install &boot record to drive/partition:"), drv);
 	drive=new TQComboBox(false, drv);
@@ -51,7 +51,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	for(StringList::const_iterator it=p.begin(); it!=p.end(); it++)
 		drive->insertItem((*it).cstr());
 	connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged()));
-	tqlayout->addWidget(drv);
+	layout->addWidget(drv);
 	TQWhatsThis::add(drv, _("Select the drive or partition you want to install the LILO boot loader to here. Unless you intend to use other boot managers in addition to LILO, this should be the MBR (master boot record) of your boot drive.<br>In this case, you should probably select <i>/dev/hda</i> if your boot drive is an IDE drive or <i>/dev/sda</i> if your boot drive is SCSI."));
 
 	TQHBox *to=new TQHBox(this);
@@ -60,7 +60,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	timeout->setSuffix(_("/10 seconds"));
 	connect(timeout, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged()));
 	to_lbl->setBuddy(timeout);
-	tqlayout->addWidget(to);
+	layout->addWidget(to);
 	TQWhatsThis::add(to, _("LILO will wait the amount of time specified here before booting the kernel (or OS) marked as <i>default</i> in the <b>Images</b> tab."));
 
 	TQHBox *modes=new TQHBox(this);
@@ -70,7 +70,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	compact=new TQCheckBox(_("Use &compact mode"), modes);
 	connect(compact, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(compact, _("Check this box if you want to use the compact mode.<br>The compact mode tries to merge read requests for adjacent sectors into a single read request. This reduces load time and keeps the boot map smaller, but will not work on all systems."));
-	tqlayout->addWidget(modes);
+	layout->addWidget(modes);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -80,7 +80,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
 	TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	tqlayout->addWidget(opts);
+	layout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -91,7 +91,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	password->setEchoMode(TQLineEdit::Password);
 	connect(password, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(configChanged()));
 	TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>."));
-	tqlayout->addWidget(pw);
+	layout->addWidget(pw);
 
 	TQHBox *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Default graphics mode on text console:"), vgab);
@@ -125,13 +125,13 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
         connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged()));
-	tqlayout->addWidget(vgab);
+	layout->addWidget(vgab);
 
 	prompt=new TQCheckBox(_("Enter LILO &prompt automatically"), this);
 	TQWhatsThis::add(prompt, _("If this box is checked, LILO goes to the LILO prompt whether or not a key is pressed. If it is turned off, LILO boots the default operating system unless shift is pressed (in that case, it goes to the LILO prompt).<br>This sets the <i>prompt</i> option in lilo.conf."));
         connect(prompt, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged()));
 
-	tqlayout->addWidget(prompt);
+	layout->addWidget(prompt);
 
 	update();
 }
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index a0f1c37..559b993 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -44,18 +44,18 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 {
 	current=""; previous=""; // Using TQString() gives problems!
 	lilo=l;
-	tqlayout=new TQHBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	layout=new TQHBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	images=new TQListBox(this);
-	tqlayout->addWidget(images, 1);
+	layout->addWidget(images, 1);
 	connect(images, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(imageSelected(const TQString &)));
 	TQWhatsThis::add(images, _("This is the list of kernels and operating systems you can currently boot. Select which one you want to edit here."));
 
 	parameters=new TQVBox(this);
 	parameters->setMargin(SPACE_MARGIN);
 	parameters->setSpacing(SPACE_INSIDE);
-	tqlayout->addWidget(parameters, 2);
+	layout->addWidget(parameters, 2);
 	image=new EditWidget(_("&Kernel:"), "", true, parameters);
 	TQWhatsThis::add(image, _("Enter the filename of the kernel you want to boot here."));
 	connect(image, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged()));
@@ -75,7 +75,7 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent,
 	actions=new TQVBox(this);
 	actions->setMargin(SPACE_MARGIN);
 	actions->setSpacing(SPACE_INSIDE);
-	tqlayout->addWidget(actions);
+	layout->addWidget(actions);
 	dflt=new TQPushButton(_("Set &Default"), actions);
 	TQWhatsThis::add(dflt, _("Boot this kernel/OS if the user doesn't make a different choice"));
 	connect(dflt, TQT_SIGNAL(clicked()), TQT_SLOT(dfltClicked()));
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 898b95b..ca52d7b 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -63,7 +63,7 @@ private:
 	liloconf	*lilo;
 	TQString		previous;
 	TQString		current;
-	TQHBoxLayout	*tqlayout;
+	TQHBoxLayout	*layout;
 	TQListBox	*images;
 	TQVBox		*parameters;
 	EditWidget	*image;
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index 75f514c..846edc8 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -38,9 +38,9 @@
 KControl::KControl(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
 	m=new MainWidget(this, name);
-	tqlayout->addWidget(m);
+	layout->addWidget(m);
 	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
         if (getuid() != 0) {
             m->makeReadOnly();
diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index 5abce8a..944ba0d 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -36,9 +36,9 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 {
 	l=lilo;
 
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 
 	TQHBox *vgab=new TQHBox(this);
 	TQLabel *vlbl=new TQLabel(_("&Graphics mode on text console:"), vgab);
@@ -71,15 +71,15 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	vga->insertItem(_("VGA 1280x1024, 32767 colors (793)"));
 	vga->insertItem(_("VGA 1280x1024, 65536 colors (794)"));
 	vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
-	tqlayout->addWidget(vgab);
+	layout->addWidget(vgab);
 	
 	readonly=new TQCheckBox(_("Mount root filesystem &read-only"), this);
 	TQWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. Since the init scripts normally take care of remounting the root filesystem in read-write mode after running some checks, this should always be turned on.<br>Don't turn this off unless you know what you're doing."));
-	tqlayout->addWidget(readonly);
+	layout->addWidget(readonly);
 
 	unsafe=new TQCheckBox(_("Do not check &partition table"), this);
 	TQWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the configuration. This shouldn't be used under \"normal\" circumstances, but it's useful, for example, for installing the possibility to boot from a floppy disk without having a floppy in the drive every time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf."));
-	tqlayout->addWidget(unsafe);
+	layout->addWidget(unsafe);
 
 	TQHBox *opts=new TQHBox(this);
 	lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts);
@@ -87,7 +87,7 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	restricted=new TQCheckBox(_("R&estrict parameters"), opts);
 	connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw()));
 	TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf."));
-	tqlayout->addWidget(opts);
+	layout->addWidget(opts);
 
 	TQHBox *pw=new TQHBox(this);
 	use_password=new TQCheckBox(_("Require &password:"), pw);
@@ -96,12 +96,12 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):
 	password->setMaxLength(15);
 	password->setEchoMode(TQLineEdit::Password);
 	TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here."));
-	tqlayout->addWidget(pw);
+	layout->addWidget(pw);
 
 	TQHBox *btns=new TQHBox(this);
 	ok=new TQPushButton(_("&OK"), btns);
 	cancel=new TQPushButton(_("&Cancel"), btns);
-	tqlayout->addWidget(btns);
+	layout->addWidget(btns);
 	connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index ca1c557..9836a91 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -33,24 +33,24 @@
 
 InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
 {
-	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-	tqlayout->setMargin(SPACE_MARGIN);
-	tqlayout->setSpacing(SPACE_INSIDE);
+	TQVBoxLayout *layout=new TQVBoxLayout(this);
+	layout->setMargin(SPACE_MARGIN);
+	layout->setSpacing(SPACE_INSIDE);
 	for(entries::iterator it=e.begin(); it!=e.end(); it++) {
 		EditWidget *ed=new EditWidget((*it).label, (*it).dflt, (*it).isFile, this);
 		TQWhatsThis::add(ed, (*it).help);
-		tqlayout->addWidget(ed);
+		layout->addWidget(ed);
 		edit.insert(edit.end(), ed);
 	}
 	if(hasCancel) {
 		TQHBox *btns=new TQHBox(this);
 		ok=new TQPushButton(_("&OK"), btns);
 		cancel=new TQPushButton(_("&Cancel"), btns);
-		tqlayout->addWidget(btns);
+		layout->addWidget(btns);
 		connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
 	} else {
 		ok=new TQPushButton(_("&OK"), this);
-		tqlayout->addWidget(ok);
+		layout->addWidget(ok);
 	}
 	connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
 }