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

1 files changed, 23 insertions, 23 deletions

diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 0cea581..39e1f59 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
@@ -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)),
@@ -274,19 +274,19 @@ void editGroup::slotOk()
     kug->getGroups().lookup( legrpname->text() ) ) {
 
     KMessageBox::sorry( 0,
-      i18n("Group with name %1 already exists.").tqarg(legrpname->text()) );
+      i18n("Group with name %1 already exists.").arg(legrpname->text()) );
     return;
   }
 
   if ( mAdd ) {
     if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) {
       KMessageBox::sorry( 0,
-        i18n("Group with SID %1 already exists.").tqarg( sid.getSID() ) );
+        i18n("Group with SID %1 already exists.").arg( sid.getSID() ) );
       return;
     }
     if (kug->getGroups().lookup(s.toInt())) {
       KMessageBox::sorry( 0,
-        i18n("Group with gid %1 already exists.").tqarg(s.toInt()) );
+        i18n("Group with gid %1 already exists.").arg(s.toInt()) );
       return;
     }
   }