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

This reverts commit d1248617107f659af9d03cf1ef6d783571a0cba8.

24 files changed, 208 insertions, 208 deletions

diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp
index 24181b9..828e225 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)));
-  frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
+  fronttqlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2);
 
   if ( useprivategroup ) pbprigr->setEnabled( false );
 }
@@ -65,14 +65,14 @@ void addUser::slotOk()
 
   if ( ( user->getCaps() & KU::KUser::Cap_POSIX ) && 
     kug->getUsers().lookup( user->getUID() ) ) {
-    KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").arg( user->getUID() ) );
+    KMessageBox::sorry( 0, i18n("User with UID %1 already exists.").tqarg( user->getUID() ) );
     return;
   }
 
   if ( ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) && 
      ( user->getCaps() & KU::KUser::Cap_Samba ) ) {
     if ( kug->getUsers().lookup_sam( user->getSID().getRID() ) ) {
-      KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").arg( user->getSID().getRID() ) );
+      KMessageBox::sorry( 0, i18n("User with RID %1 already exists.").tqarg( user->getSID().getRID() ) );
       return;
     }
   }
@@ -115,15 +115,15 @@ bool addUser::checkHome()
        if ( KMessageBox::
          warningContinueCancel ( 0,
            i18n("Folder %1 already exists!\n%2 may become owner and permissions may change.\nDo you really want to use %3?").
-           arg(h_dir).arg(user->getName()).arg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
+           tqarg(h_dir).tqarg(user->getName()).tqarg(h_dir), TQString(), KStdGuiItem::cont() ) == KMessageBox::Cancel )
 
          return false;
        else
          return true;
     } else
-      KMessageBox::error( 0, i18n("%1 is not a folder.").arg(h_dir) );
+      KMessageBox::error( 0, i18n("%1 is not a folder.").tqarg(h_dir) );
   } else
-    KMessageBox::error( 0, i18n("stat() failed on %1.").arg(h_dir) );
+    KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(h_dir) );
 
   return false;
 }
@@ -145,13 +145,13 @@ bool addUser::checkMailBox()
   if (r == 0)
     if (S_ISREG(s.st_mode))
       KMessageBox::error( 0, i18n("Mailbox %1 already exists (uid=%2).")
-                 .arg(mailboxpath)
-                 .arg(s.st_uid) );
+                 .tqarg(mailboxpath)
+                 .tqarg(s.st_uid) );
     else
       KMessageBox::error( 0, i18n("%1 exists but is not a regular file.")
-                 .arg(mailboxpath) );
+                 .tqarg(mailboxpath) );
   else
-    KMessageBox::error( 0, i18n("stat() failed on %1.").arg(mailboxpath) );
+    KMessageBox::error( 0, i18n("stat() failed on %1.").tqarg(mailboxpath) );
 
   return false;
 }
diff --git a/kuser/delUser.cpp b/kuser/delUser.cpp
index b1ee7e0..775ff6c 100644
--- a/kuser/delUser.cpp
+++ b/kuser/delUser.cpp
@@ -30,11 +30,11 @@ delUser::delUser(KU::KUser *AUser, TQWidget *parent, const char *name)
 {                   
   TQVBox *page = makeVBoxMainWidget();
   new TQLabel( i18n("<p>Deleting user <b>%1</b>"
-                   "<p>Also perform the following actions:").arg(AUser->getName()),
+                   "<p>Also perform the following actions:").tqarg(AUser->getName()),
               page);
-  m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").arg(AUser->getHomeDir()), page);
+  m_deleteHomeDir = new TQCheckBox(i18n("Delete &home folder: %1").tqarg(AUser->getHomeDir()), page);
   TQString mailboxpath = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + AUser->getName();
-  m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").arg(mailboxpath), page);
+  m_deleteMailBox = new TQCheckBox(i18n("Delete &mailbox: %1").tqarg(mailboxpath), page);
   setButtonGuiItem(KDialogBase::Ok, KStdGuiItem::del());
 }
 
diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp
index 39e1f59..0cea581 100644
--- a/kuser/editGroup.cpp
+++ b/kuser/editGroup.cpp
@@ -20,7 +20,7 @@
 
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQGridLayout( page, 10, 3, marginHint(), spacingHint() );
+  TQGridLayout *tqlayout = 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 );
-  layout->addWidget( lb, 0, 0 );
-  layout->addMultiCellWidget( legid, 0, 0, 1, 2 );
+  tqlayout->addWidget( lb, 0, 0 );
+  tqlayout->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 );
-    layout->addWidget( lb, 1, 0 );
-    layout->addMultiCellWidget( lerid, 1, 1, 1, 2 );
+    tqlayout->addWidget( lb, 1, 0 );
+    tqlayout->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 );
-  layout->addWidget( lb, 2, 0 );
-  layout->addMultiCellWidget( legrpname, 2, 2, 1, 2 );
+  tqlayout->addWidget( lb, 2, 0 );
+  tqlayout->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 );
-    layout->addWidget( lb, 3, 0 );
-    layout->addMultiCellWidget( ledesc, 3, 3, 1, 2 );
+    tqlayout->addWidget( lb, 3, 0 );
+    tqlayout->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 );
-    layout->addWidget( lb, 4, 0 );
-    layout->addMultiCellWidget( ledispname, 4, 4, 1, 2 );
+    tqlayout->addWidget( lb, 4, 0 );
+    tqlayout->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 );
-    layout->addWidget( lb, 5, 0 );
-    layout->addMultiCellWidget( letype, 5, 5, 1, 2 );
+    tqlayout->addWidget( lb, 5, 0 );
+    tqlayout->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 );
-    layout->addWidget( lb, 6, 0 );
-    layout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
+    tqlayout->addWidget( lb, 6, 0 );
+    tqlayout->addMultiCellWidget( ledomsid, 6, 6, 1, 2 );
 
     cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page );
-    layout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 );
+    tqlayout->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 );
-  layout->addWidget( m_list_in, 8, 0 );
+  tqlayout->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);
-  layout->addWidget( vbox, 8, 1 );
+  tqlayout->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);
-  layout->addWidget( m_list_notin, 8, 2 );
+  tqlayout->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.").arg(legrpname->text()) );
+      i18n("Group with name %1 already exists.").tqarg(legrpname->text()) );
     return;
   }
 
   if ( mAdd ) {
     if ( mSamba && !cbsamba->isChecked() && kug->getGroups().lookup_sam( sid ) ) {
       KMessageBox::sorry( 0,
-        i18n("Group with SID %1 already exists.").arg( sid.getSID() ) );
+        i18n("Group with SID %1 already exists.").tqarg( sid.getSID() ) );
       return;
     }
     if (kug->getGroups().lookup(s.toInt())) {
       KMessageBox::sorry( 0,
-        i18n("Group with gid %1 already exists.").arg(s.toInt()) );
+        i18n("Group with gid %1 already exists.").tqarg(s.toInt()) );
       return;
     }
   }
diff --git a/kuser/filessettings.ui b/kuser/filessettings.ui
index 83a8827..abbafb6 100644
--- a/kuser/filessettings.ui
+++ b/kuser/filessettings.ui
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index 2efcab5..ed650d2 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -155,7 +155,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp
index 77fcc91..dbbff91 100644
--- a/kuser/kgroup.cpp
+++ b/kuser/kgroup.cpp
@@ -28,7 +28,7 @@
 
 KU::KGroup::KGroup()
 {
-  pwd = TQString::fromLatin1("*");
+  pwd = TQString::tqfromLatin1("*");
   gid = 0;
   type = 2;
   caps = 0;
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 8734936..4534ac5 100644
--- a/kuser/kgroupfiles.cpp
+++ b/kuser/kgroupfiles.cpp
@@ -95,7 +95,7 @@ bool KGroupFiles::reload()
     rc = stat(TQFile::encodeName(filename), &st);
     if(rc != 0) {
       KMessageBox::error( 0, i18n("stat call on file %1 failed: %2\nCheck KUser settings.").
-        arg(filename).arg(TQString::fromLatin1(strerror(errno))) );
+        tqarg(filename).tqarg(TQString::tqfromLatin1(strerror(errno))) );
       if( (processing_file & GROUP) != 0 ) {
         group_errno = errno;
         if(!nisgroup_filename.isEmpty()) {
@@ -121,7 +121,7 @@ bool KGroupFiles::reload()
     FILE *fgrp = fopen(TQFile::encodeName(filename), "r");
     TQString tmp;
     if (fgrp == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
       return FALSE;
     }
 
@@ -194,16 +194,16 @@ bool KGroupFiles::save()
   // read KUser configuration info
 
   group_filename = mCfg->groupsrc();
-  new_group_filename = group_filename + TQString::fromLatin1(KU_CREATE_EXT);
+  new_group_filename = group_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
 #ifdef HAVE_SHADOW
   gshadow_filename = mCfg->gshadowsrc();
   if ( !KStandardDirs::exists( gshadow_filename ) )
       gshadow_filename = TQString();
   else
-      new_gshadow_filename = gshadow_filename + TQString::fromLatin1(KU_CREATE_EXT);
+      new_gshadow_filename = gshadow_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
 #endif
   nisgroup_filename = mCfg->nisgroupsrc();
-  new_nisgroup_filename = nisgroup_filename + TQString::fromLatin1(KU_CREATE_EXT);
+  new_nisgroup_filename = nisgroup_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
   if( nisgroup_filename != group_filename ) {
     mingid = mCfg->nismingid();
   }
@@ -233,14 +233,14 @@ bool KGroupFiles::save()
 
   if(!group_filename.isEmpty()) {
     if((group_fd = fopen(TQFile::encodeName(new_group_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_group_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_group_filename) );
       return false;
     }
   }
 
   if(!gshadow_filename.isEmpty()) {
     if((gshadow_fd = fopen(TQFile::encodeName(new_gshadow_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_gshadow_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_gshadow_filename) );
       if ( group_fd ) fclose ( group_fd );
       return false;
     }
@@ -248,7 +248,7 @@ bool KGroupFiles::save()
 
   if(!nisgroup_filename.isEmpty() && (nisgroup_filename != group_filename)) {
     if((nisgroup_fd = fopen(TQFile::encodeName(new_nisgroup_filename), "w")) == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_nisgroup_filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_nisgroup_filename) );
       if ( group_fd ) fclose ( group_fd );
       if ( gshadow_fd ) fclose ( gshadow_fd );
       return false;
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index 4ac7c43..cfd3e49 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -548,24 +548,24 @@ int KU::KUser::createHome()
 {
 
   if(p_dir.isNull() || p_dir.isEmpty()) {
-    KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").arg(p_name) );
+    KMessageBox::sorry( 0, i18n("Cannot create home folder for %1: it is null or empty.").tqarg(p_name) );
     return(0);
   }
   if (mkdir(TQFile::encodeName(p_dir), 0700) != 0) {
     if (errno != EEXIST)
     {
-      KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("Cannot create home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       return(0);
     }
   }
 
   if (chown(TQFile::encodeName(p_dir), p_uid, p_gid) != 0) {
-    KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+    KMessageBox::error( 0, i18n("Cannot change owner of home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
     return(1);
   }
 
   if (chmod(TQFile::encodeName(p_dir), KU_HOMEDIR_PERM) != 0) {
-    KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+    KMessageBox::error( 0, i18n("Cannot change permissions on home folder %1.\nError: %2").tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
     return(1);
   }
   return(1);
@@ -580,33 +580,33 @@ int KU::KUser::tryCreate(const TQString &dir)
   if (rc == 0) {
     if (S_ISDIR(sb.st_mode)) {
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").arg(dir).arg(p_name),
+        i18n("Folder %1 already exists!\nWill make %2 owner and change permissions.\nDo you want to continue?").tqarg(dir).tqarg(p_name),
         TQString(), KStdGuiItem::cont() ) == KMessageBox::Continue) {
 
         if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
-          KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+          KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2") .tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
         }
         return(0);
       } else {
-        KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").arg(dir).arg(p_name) );
+        KMessageBox::information( 0, i18n("Folder %1 left 'as is'.\nVerify ownership and permissions for user %2 who may not be able to log in!").tqarg(dir).tqarg(p_name) );
         return(-1);
       }
     } else {
-      KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").arg(dir).arg(p_name) );
+      KMessageBox::information( 0, i18n("%1 exists and is not a folder. User %2 will not be able to log in!").tqarg(dir).tqarg(p_name) );
       return(-1);
     }
   } else {
     if (errno == ENOENT) {
       if (mkdir(TQFile::encodeName(dir), 0700) != 0) {
-        KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))));
+        KMessageBox::error( 0, i18n("Cannot create %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))));
         return(-1);
       }
       if (chown(TQFile::encodeName(dir), p_uid, p_gid) != 0) {
-        KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+        KMessageBox::error( 0, i18n("Cannot change owner of %1 folder.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
       return(0);
     } else {
-      KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").arg(dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("stat call on %1 failed.\nError: %2").tqarg(dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       return(-1);
     }
   }
@@ -622,8 +622,8 @@ int KU::KUser::createMailBox()
     if (errno != EEXIST)
     {
       KMessageBox::error( 0, i18n("Cannot create %1: %2")
-                .arg(mailboxpath)
-                .arg(TQString::fromLocal8Bit(strerror(errno))) );
+                .tqarg(mailboxpath)
+                .tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       return -1;
     }
   }
@@ -632,13 +632,13 @@ int KU::KUser::createMailBox()
 
   if (chown(TQFile::encodeName(mailboxpath), p_uid, KU_MAILBOX_GID) != 0) {
     KMessageBox::error( 0, i18n("Cannot change owner on mailbox: %1\nError: %2")
-                .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
     return -1;
   }
 
   if (chmod(TQFile::encodeName(mailboxpath), KU_MAILBOX_PERM) != 0) {
     KMessageBox::error( 0, i18n("Cannot change permissions on mailbox: %1\nError: %2")
-                .arg(mailboxpath).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                .tqarg(mailboxpath).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
     return -1;
   }
 
@@ -651,8 +651,8 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
   TQDir s(srcPath);
   TQDir d(dstPath);
 
-  TQString dot = TQString::fromLatin1(".");
-  TQString dotdot = TQString::fromLatin1("..");
+  TQString dot = TQString::tqfromLatin1(".");
+  TQString dotdot = TQString::tqfromLatin1("..");
   
   s.setFilter( TQDir::All | TQDir::Hidden | TQDir::System );
 
@@ -683,7 +683,7 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (symlink(TQFile::encodeName(link),TQFile::encodeName(d.filePath(name))) != 0) {
         KMessageBox::error( 0, i18n("Error creating symlink %1.\nError: %2")
-                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
     } else if ( info.isDir() ) {
       TQDir dir(filename);
@@ -693,12 +693,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
         KMessageBox::error( 0, i18n("Cannot change owner of folder %1.\nError: %2")
-                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
       if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
         KMessageBox::error( 0, i18n("Cannot change permissions on folder %1.\nError: %2")
-                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
     } else {
@@ -708,12 +708,12 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
 
       if (chown(TQFile::encodeName(d.filePath(name)), p_uid, p_gid) != 0) {
         KMessageBox::error( 0, i18n("Cannot change owner of file %1.\nError: %2")
-                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
 
       if (chmod(TQFile::encodeName(d.filePath(name)), mode) != 0) {
         KMessageBox::error( 0, i18n("Cannot change permissions on file %1.\nError: %2")
-                  .arg(d.filePath(s[i])).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(d.filePath(s[i])).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       }
     }
   }
@@ -726,12 +726,12 @@ int KU::KUser::copySkel()
   mode_t mode;
   
   if (!s.exists()) {
-    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").arg(s.absPath()).arg(p_name) );
+    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton for %2.").tqarg(s.absPath()).tqarg(p_name) );
     return (-1);
   }
 
   if (!d.exists()) {
-    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").arg(d.absPath()) );
+    KMessageBox::error( 0, i18n("Folder %1 does not exist, cannot copy skeleton.").tqarg(d.absPath()) );
     return (-1);
   }
   
@@ -750,14 +750,14 @@ int KU::KUser::removeHome()
     if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
       if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
              KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
-                       .arg(p_dir).arg(KIO::NetAccess::lastErrorString()) );
+                       .tqarg(p_dir).tqarg(KIO::NetAccess::lastErrorString()) );
       }
     } else {
-      KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) );
+      KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").tqarg(p_dir).tqarg(sb.st_uid).tqarg(sb.st_gid) );
     }
   else {
     KMessageBox::error( 0, i18n("stat call on file %1 failed.\nError: %2")
-                 .arg(p_dir).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                 .tqarg(p_dir).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
   }
 
   return 0;
@@ -772,10 +772,10 @@ int KU::KUser::removeCrontabs()
 
   file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
   if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
-    command = TQString::fromLatin1("crontab -u %1 -r").arg(KProcess::quote(p_name));
+    command = TQString::tqfromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
     if ( system(TQFile::encodeName(command)) != 0 ) {
       KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2")
-                  .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                  .tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
      }
   }
 
@@ -789,7 +789,7 @@ int KU::KUser::removeMailBox()
   file = TQFile::decodeName(MAIL_SPOOL_DIR) + "/" + p_name;
   if (remove(TQFile::encodeName(file)) != 0) {
     KMessageBox::error( 0, i18n("Cannot remove mailbox %1.\nError: %2")
-                .arg(file).arg(TQString::fromLocal8Bit(strerror(errno))) );
+                .tqarg(file).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
   }
 
   return 0;
@@ -808,7 +808,7 @@ int KU::KUser::removeProcesses()
         break;
       case -1:
         KMessageBox::error( 0,
-          i18n("Cannot fork while trying to kill processes for uid %1.").arg(p_uid) );
+          i18n("Cannot fork while trying to kill processes for uid %1.").tqarg(p_uid) );
         break;
     }
 
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 5ccfe58..868f100 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -115,7 +115,7 @@ bool KUserFiles::loadpwd()
     mCfg->setPasswdsrc( PASSWORD_FILE );
     mCfg->setGroupsrc( GROUP_FILE );
     passwd_filename = mCfg->passwdsrc();
-    KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").arg(mCfg->passwdsrc().arg(mCfg->groupsrc())) );
+    KMessageBox::error( 0, i18n("KUser sources were not configured.\nLocal passwd source set to %1\nLocal group source set to %2.").tqarg(mCfg->passwdsrc().tqarg(mCfg->groupsrc())) );
   }
 
   if(!passwd_filename.isEmpty()) {
@@ -128,7 +128,7 @@ bool KUserFiles::loadpwd()
   for(int i = 0; i < MAXFILES; i++) {
     rc = stat(TQFile::encodeName(filename), &st);
     if(rc != 0) {
-      KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").arg(filename).arg(TQString::fromLocal8Bit(strerror(errno))) );
+      KMessageBox::error( 0, i18n("Stat call on file %1 failed: %2\nCheck KUser settings.").tqarg(filename).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
       if( (processing_file & P_PASSWD) != 0 ) {
         passwd_errno = errno;
         if(!nispasswd_filename.isEmpty()) {
@@ -155,7 +155,7 @@ bool KUserFiles::loadpwd()
 #ifdef HAVE_FGETPWENT
     FILE *fpwd = fopen(TQFile::encodeName(filename), "r");
     if(fpwd == NULL) {
-      KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(filename) );
+      KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(filename) );
       return FALSE;
     }
 
@@ -179,7 +179,7 @@ bool KUserFiles::loadpwd()
       tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
       tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
 #if defined(__FreeBSD__) || defined(__bsdi__)
-      tmpKU->setClass(TQString::fromLatin1(p->pw_class));
+      tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
       tmpKU->setLastChange(p->pw_change);
       tmpKU->setExpire(p->pw_expire);
 #endif
@@ -238,7 +238,7 @@ bool KUserFiles::loadsdw()
   FILE *f;
   kdDebug() << "open shadow file: " << shadow_file << endl;
   if ((f = fopen( TQFile::encodeName(shadow_file), "r")) == NULL) {
-    KMessageBox::error( 0, i18n("Error opening %1 for reading.").arg(shadow_file) );
+    KMessageBox::error( 0, i18n("Error opening %1 for reading.").tqarg(shadow_file) );
     caps &= ~Cap_Shadow;
     return TRUE;
   }
@@ -250,7 +250,7 @@ bool KUserFiles::loadsdw()
 
     kdDebug() << "shadow entry: " << spw->sp_namp << endl;
     if ((up = lookup(TQString::fromLocal8Bit(spw->sp_namp))) == NULL) {
-      KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").arg(TQString::fromLocal8Bit(spw->sp_namp)) );
+      KMessageBox::error( 0, i18n("No /etc/passwd entry for %1.\nEntry will be removed at the next `Save'-operation.").tqarg(TQString::fromLocal8Bit(spw->sp_namp)) );
       continue;
     }
 
@@ -314,9 +314,9 @@ bool KUserFiles::savepwd()
   passwd_filename = mCfg->passwdsrc();
   nispasswd_filename = mCfg->nispasswdsrc();
   TQString new_passwd_filename =
-    passwd_filename + TQString::fromLatin1(KU_CREATE_EXT);
+    passwd_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
   TQString new_nispasswd_filename =
-    nispasswd_filename+TQString::fromLatin1(KU_CREATE_EXT);
+    nispasswd_filename+TQString::tqfromLatin1(KU_CREATE_EXT);
 
   if( nispasswd_filename != passwd_filename ) {
     minuid = mCfg->nisminuid();
@@ -343,13 +343,13 @@ bool KUserFiles::savepwd()
   if(!passwd_filename.isEmpty()) {
     if ((passwd_fd =
       fopen(TQFile::encodeName(new_passwd_filename),"w")) == NULL)
-        KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(passwd_filename) );
+        KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(passwd_filename) );
   }
 
   if(!nispasswd_filename.isEmpty() && (nispasswd_filename != passwd_filename)){
     if ((nispasswd_fd =
       fopen(TQFile::encodeName(new_nispasswd_filename),"w")) == NULL)
-        KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(nispasswd_filename) );
+        KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(nispasswd_filename) );
   }
 
   TQPtrListIterator<KU::KUser> it( mUsers );
@@ -512,7 +512,7 @@ bool KUserFiles::savesdw()
   struct spwd s;
   KU::KUser *up;
   TQString shadow_file = mCfg->shadowsrc();
-  TQString new_shadow_file = shadow_file+TQString::fromLatin1(KU_CREATE_EXT);
+  TQString new_shadow_file = shadow_file+TQString::tqfromLatin1(KU_CREATE_EXT);
 
   if ( shadow_file.isEmpty() )
     return TRUE;
@@ -523,7 +523,7 @@ bool KUserFiles::savesdw()
   }
 
   if ((f = fopen(TQFile::encodeName(new_shadow_file), "w")) == NULL) {
-    KMessageBox::error( 0, i18n("Error opening %1 for writing.").arg(new_shadow_file) );
+    KMessageBox::error( 0, i18n("Error opening %1 for writing.").tqarg(new_shadow_file) );
     return FALSE;
   }
 
@@ -588,7 +588,7 @@ void KUserFiles::createPassword( KU::KUser *user, const TQString &password )
 {
   if ( caps & Cap_Shadow ) {
     user->setSPwd( encryptPass( password, mCfg->md5shadow() ) );
-    user->setPwd( TQString::fromLatin1("x") );
+    user->setPwd( TQString::tqfromLatin1("x") );
   } else
     user->setPwd( encryptPass( password, false ) );
 }
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index 74ee465..5d4979a 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -341,7 +341,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
             hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
             hash[12], hash[13], hash[14], hash[15]);
 
-    user->setNTPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
+    user->setNTPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
 
     if ( mCfg->lanmanhash() ) {
 
@@ -354,7 +354,7 @@ void KUserLDAP::createPassword( KU::KUser *user, const TQString &password )
             hash[6], hash[7], hash[8], hash[9], hash[10], hash[11],
             hash[12], hash[13], hash[14], hash[15]);
 
-      user->setLMPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
+      user->setLMPwd( TQString::tqfromLatin1( (const char*) &hex, 32 ) );
     } else {
       user->setLMPwd( "" );
     }
@@ -372,11 +372,11 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
   cn = mCfg->ldapcnfullname() ? user->getFullName() : user->getName();
   if ( cn.isEmpty() ) cn = user->getName();
 
-  gecos = TQString::fromLatin1("%1,%2,%3,%4")
-    .arg(user->getFullName())
-    .arg(user->getOffice1())
-    .arg(user->getOffice2())
-    .arg(user->getAddress());
+  gecos = TQString::tqfromLatin1("%1,%2,%3,%4")
+    .tqarg(user->getFullName())
+    .tqarg(user->getOffice1())
+    .tqarg(user->getOffice2())
+    .tqarg(user->getAddress());
 
   samflags = "[U";
   samflags += user->getDisabled() ? 'D' : ' ';
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 8c67fcb..584bd74 100644
--- a/kuser/kusersystem.cpp
+++ b/kuser/kusersystem.cpp
@@ -88,7 +88,7 @@ bool KUserSystem::loadpwd()
     tmpKU->setHomeDir(TQString::fromLocal8Bit(p->pw_dir));
     tmpKU->setShell(TQString::fromLocal8Bit(p->pw_shell));
 #if defined(__FreeBSD__) || defined(__bsdi__)
-    tmpKU->setClass(TQString::fromLatin1(p->pw_class));
+    tmpKU->setClass(TQString::tqfromLatin1(p->pw_class));
     tmpKU->setLastChange(p->pw_change);
     tmpKU->setExpire(p->pw_expire);
 #endif
diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp
index 6059726..43bb19b 100644
--- a/kuser/kuservw.cpp
+++ b/kuser/kuservw.cpp
@@ -45,7 +45,7 @@ int KUserViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
 }
 
 void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                               int column, int width, int alignment )
+                               int column, int width, int tqalignment )
 {
     TQColorGroup _cg( cg );
     TQColor c = _cg.text();
@@ -53,7 +53,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg,
     if ( mUser->getDisabled() )
         _cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() );
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    KListViewItem::paintCell( p, _cg, column, width, tqalignment );
 
     _cg.setColor( TQColorGroup::Text, c );
 }
diff --git a/kuser/kuservw.h b/kuser/kuservw.h
index f69573d..fa5827f 100644
--- a/kuser/kuservw.h
+++ b/kuser/kuservw.h
@@ -35,7 +35,7 @@ public:
 private:  
   virtual TQString text ( int ) const;
   virtual void paintCell( TQPainter *p, const TQColorGroup &cg,
-    int column, int width, int alignment );
+    int column, int width, int tqalignment );
   virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
   KU::KUser *mUser;
 };
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 7dff3a1..7d962f6 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -40,7 +40,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -220,7 +220,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -264,7 +264,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -283,7 +283,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index 6466874..575ea2f 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -253,7 +253,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp
index fd9eee6..5d168ac 100644
--- a/kuser/mainView.cpp
+++ b/kuser/mainView.cpp
@@ -165,7 +165,7 @@ void mainView::userdel()
     if ( group &&
       KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n"
         "Do you want to delete the user's private group '%1'?")
-        .arg(group->getName()), TQString(),
+        .tqarg(group->getName()), TQString(),
         KStdGuiItem::del(), i18n("Do Not Delete")) == KMessageBox::Yes) {
       kdDebug() << "del private group" << endl;
       kug->getGroups().del( group );
@@ -203,7 +203,7 @@ void mainView::useradd()
   if ( !ok ) return;
 
   if ( kug->getUsers().lookup( name ) ) {
-    KMessageBox::sorry( 0, i18n("User with name %1 already exists.").arg( name ) );
+    KMessageBox::sorry( 0, i18n("User with name %1 already exists.").tqarg( name ) );
     return;
   }
 
@@ -305,7 +305,7 @@ void mainView::setpwd()
   if ( count > 1 ) {
     if ( KMessageBox::questionYesNo( 0,
       i18n("You have selected %1 users. Do you really want to change the password for all the selected users?")
-		.arg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
+		.tqarg( count ), TQString(), i18n("Change"), i18n("Do Not Change") ) == KMessageBox::No ) return;
   }
   pwddlg d( this );
   if ( d.exec() != TQDialog::Accepted ) return;
@@ -444,7 +444,7 @@ void mainView::grpdel()
       KU::KUser *user = kug->getUsers().first();
       while ( user ) {
         if ( user->getGID() == group->getGID() ) {
-          KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).arg( group->getName() ).arg( user->getName() ) );
+          KMessageBox::error( 0, i18n( "The group '%1' is the primary group of one or more users (such as '%2'); it cannot be deleted." ).tqarg( group->getName() ).tqarg( user->getName() ) );
           return;
         }
         user = kug->getUsers().next();
@@ -457,12 +457,12 @@ void mainView::grpdel()
     case 0: return;
     case 1:
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Do you really want to delete the group '%1'?").arg(group->getName()),
+        i18n("Do you really want to delete the group '%1'?").tqarg(group->getName()),
         TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
       break;
     default:
       if (KMessageBox::warningContinueCancel( 0,
-        i18n("Do you really want to delete the %1 selected groups?").arg(selected),
+        i18n("Do you really want to delete the %1 selected groups?").tqarg(selected),
         TQString(), KStdGuiItem::del()) != KMessageBox::Continue) return;
   }
 
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index 0f3dfbd..95524f3 100644
--- a/kuser/mainWidget.cpp
+++ b/kuser/mainWidget.cpp
@@ -73,7 +73,7 @@ void mainWidget::setupActions()
 
   KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection());
 
-#define BarIconC(x)	BarIcon(TQString::fromLatin1(x))
+#define BarIconC(x)	BarIcon(TQString::tqfromLatin1(x))
 
   (void) new KAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md),
     TQT_SLOT(useradd()), actionCollection(), "add_user");
diff --git a/kuser/misc.cpp b/kuser/misc.cpp
index 6b26a72..2e1ebab 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -37,13 +37,13 @@
 
 bool backup(const TQString & name)
 {
-  TQString tmp = name + TQString::fromLatin1(KU_BACKUP_EXT);
+  TQString tmp = name + TQString::tqfromLatin1(KU_BACKUP_EXT);
   TQFile::remove( tmp );
 
   if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
   {
     TQString str;
-    KMessageBox::error( 0, i18n("Can't create backup file for %1").arg(name) );
+    KMessageBox::error( 0, i18n("Can't create backup file for %1").tqarg(name) );
     return false;
   }
   return true;
@@ -68,17 +68,17 @@ int copyFile(const TQString & from, const TQString & to)
   fo.setName(to);
   
   if (!fi.exists()) {
-    KMessageBox::error( 0, i18n("File %1 does not exist.").arg(from) );
+    KMessageBox::error( 0, i18n("File %1 does not exist.").tqarg(from) );
     return (-1);
   }
 
   if (!fi.open(IO_ReadOnly)) {
-    KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").arg(from) );
+    KMessageBox::error( 0, i18n("Cannot open file %1 for reading.").tqarg(from) );
     return (-1);
   }
 
   if (!fo.open(IO_Raw | IO_WriteOnly | IO_Truncate)) {
-    KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").arg(to) );
+    KMessageBox::error( 0, i18n("Cannot open file %1 for writing.").tqarg(to) );
     return (-1);
   }
   
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index e14a809..a68d629 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -26,7 +26,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -39,7 +39,7 @@
                     <property name="text">
                         <string>Time before password expires to issue an expire warning:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -53,7 +53,7 @@
                     <property name="text">
                         <string>Time when password expires after last password change:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>Time when account will be disabled after expiration of password:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -115,7 +115,7 @@
                     <property name="text">
                         <string>Time before password may not be changed after last password change:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -206,7 +206,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index ac3b00e..dbd73d0 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -23,7 +23,7 @@
 
 #include <tqdatetime.h>
 #include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqfile.h>
 
@@ -38,38 +38,38 @@
 #include "kglobal_.h"
 #include "misc.h"
 
-void propdlg::addRow(TQWidget *parent, TQGridLayout *layout, int row,
+void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, 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());
-   layout->addWidget(lab, row, 0);
+   lab->setMinimumSize(lab->tqsizeHint());
+   widget->setMinimumSize(widget->tqsizeHint());
+   tqlayout->addWidget(lab, row, 0);
    if (!what.isEmpty())
    {
       TQWhatsThis::add(lab, what);
       TQWhatsThis::add(widget, what);
    }
    if (two_column)
-      layout->addMultiCellWidget(widget, row, row, 1, 2);
+      tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
    else
-      layout->addWidget(widget, row, 1);
+      tqlayout->addWidget(widget, row, 1);
 
    if ( !nochange || ro ) return;
    TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-   layout->addWidget( nc, row, 3 );
+   tqlayout->addWidget( nc, row, 3 );
    nc->hide();
    mNoChanges[ widget ] = nc;
 }
 
-KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int row,
+KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *tqlayout, int row,
   const TQString &title, bool never)
 {
     KIntSpinBox *days;
 
     TQLabel *label = new TQLabel( title, parent );
-    layout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
+    tqlayout->addMultiCellWidget( label, row, row, 0, 1, AlignRight );
 
     days = new KIntSpinBox( parent );
     label->setBuddy( days );
@@ -84,12 +84,12 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int r
     {
       days->setMinValue( 0 );
     }
-    layout->addWidget( days, row, 2 );
+    tqlayout->addWidget( days, row, 2 );
 
     connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
 
     TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent );
-    layout->addWidget( nc, row, 3 );
+    tqlayout->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 *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     frontpage = frame;
-    frontlayout = layout;
+    fronttqlayout = tqlayout;
 
     lbuser = new TQLabel(frame);
 //    whatstr = i18n("WHAT IS THIS: User login");
-    addRow(frame, layout, row++, lbuser, i18n("User login:"), whatstr, false, false);
+    addRow(frame, tqlayout, 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, layout, row++, leid, i18n("&User ID:"), whatstr);
+    addRow(frame, tqlayout, 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);
-      layout->addWidget(pbsetpwd, 0, 2);
+      tqlayout->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, layout, row++, lefname, i18n("Full &name:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, lesurname, i18n("Surname:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, lemail, i18n("Email address:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, leshell, i18n("&Login shell:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, lehome, i18n("&Home folder:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, leoffice, i18n("&Office:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, leophone, i18n("Offi&ce Phone:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, lehphone, i18n("Ho&me Phone:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, leclass, i18n("Login class:"), whatstr, true);
+      addRow(frame, tqlayout, 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, layout, row++, leoffice1, i18n("&Office #1:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, leoffice2, i18n("O&ffice #2:"), whatstr);
+      addRow(frame, tqlayout, 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, layout, row++, leaddress, i18n("&Address:"), whatstr);
+      addRow(frame, tqlayout, row++, leaddress, i18n("&Address:"), whatstr);
     }
     cbdisabled = new TQCheckBox(frame);
     connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()));
-    addRow(frame, layout, row++, cbdisabled, i18n("Account &disabled"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr);
+      addRow(frame, tqlayout, 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 *layout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
+    TQGridLayout *tqlayout = new TQGridLayout(frame, 20, 4, marginHint(), spacingHint());
     int row = 0;
 
     TQDateTime time;
     leslstchg = new TQLabel(frame);
-    addRow(frame, layout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
+    addRow(frame, tqlayout, row++, leslstchg, i18n("Last password change:"), TQString(), true);
 
-    layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+    tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
     row++;
 
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Shadow ) {
-      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);
+      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);
       row++;
     }
     /*
     if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Samba ) {
-      layout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
-      layout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
+      tqlayout->addWidget( new TQLabel( "SAMBA parameters:", frame ), row++, 0 );
+      tqlayout->addMultiCellWidget(new KSeparator(KSeparator::HLine, frame), row, row, 0, 3);
       row++;
     }
     */
     TQLabel *label = new TQLabel( i18n("&Account will expire on:"), frame );
-    layout->addWidget( label, row, 0 );
+    tqlayout->addWidget( label, row, 0 );
     lesexpire = new KDateTimeWidget( frame );
     label->setBuddy( lesexpire );
-    layout->addMultiCellWidget( lesexpire, row, row, 1, 2);
+    tqlayout->addMultiCellWidget( lesexpire, row, row, 1, 2);
 
     cbexpire = new TQCheckBox( i18n("Never"), frame );
-    layout->addWidget( cbexpire, row++, 3 );
+    tqlayout->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 *layout = new TQGridLayout(frame, 10, 4, marginHint(), spacingHint());
+    TQGridLayout *tqlayout = 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, layout, row++, lerid, i18n("RID:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, leliscript, i18n("Login script:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, leprofile, i18n("Profile path:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, lehomedrive, i18n("Home drive:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, lehomepath, i18n("Home path:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, leworkstations, i18n("User workstations:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, ledomain, i18n("Domain name:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, ledomsid, i18n("Domain SID:"), whatstr);
+    addRow(frame, tqlayout, 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, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
+    addRow(frame, tqlayout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr);
   }
 
   // Tab 4: Groups
   {
     TQFrame *frame = addPage(i18n("Groups"));
-    TQGridLayout *layout = new TQGridLayout(frame, 2, 2, marginHint(), spacingHint());
+    TQGridLayout *tqlayout = 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);
-    layout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
+    tqlayout->addMultiCellWidget(lstgrp, 0, 0, 0, 1);
     leprigr = new TQLabel( i18n("Primary group: "), frame );
-    layout->addWidget( leprigr, 1, 0 );
+    tqlayout->addWidget( leprigr, 1, 0 );
     if ( !ro ) {
       pbprigr = new TQPushButton( i18n("Set as Primary"), frame );
-      layout->addWidget( pbprigr, 1, 1 );
+      tqlayout->addWidget( pbprigr, 1, 1 );
       connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) );
     }
     connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) );
@@ -346,7 +346,7 @@ propdlg::propdlg( const TQPtrList<KU::KUser> &users,
 {
   mUsers = users;
   if ( mUsers.getFirst() != mUsers.getLast() )
-    setCaption( i18n("User Properties - %1 Selected Users").arg( mUsers.count() ) );
+    setCaption( i18n("User Properties - %1 Selected Users").tqarg( mUsers.count() ) );
   initDlg();
   loadgroups( false );
   selectuser();
@@ -658,14 +658,14 @@ void propdlg::setpgroup()
      {
         item->setEnabled(true);
         item->setOn(prevPrimaryGroupWasOn);
-        item->repaint();
+        item->tqrepaint();
      }
      if ( groupName == primaryGroup )
      {
         primaryGroupWasOn = item->isOn();
         item->setEnabled(false);
         item->setOn(true);
-        item->repaint();
+        item->tqrepaint();
      }
 
      item = (TQCheckListItem *) item->nextSibling();
@@ -941,7 +941,7 @@ void propdlg::slotOk()
   {
     if (kug->getUsers().lookup(newuid)) {
       KMessageBox::sorry( 0,
-        i18n("User with UID %1 already exists").arg(newuid) );
+        i18n("User with UID %1 already exists").tqarg(newuid) );
       return;
     }
   }
@@ -951,7 +951,7 @@ void propdlg::slotOk()
     if ( oldrid != newrid ) {
       if (kug->getUsers().lookup_sam(newrid)) {
         KMessageBox::sorry( 0,
-          i18n("User with RID %1 already exists").arg(newrid) );
+          i18n("User with RID %1 already exists").tqarg(newrid) );
         return;
       }
     }
@@ -968,7 +968,7 @@ void propdlg::slotOk()
       		i18n("<p>The shell %1 is not yet listed in the file %2. "
       		     "In order to use this shell you must add it to "
       		     "this file first."
-      		     "<p>Do you want to add it now?").arg(newshell).arg(TQFile::decodeName(SHELL_FILE)),
+      		     "<p>Do you want to add it now?").tqarg(newshell).tqarg(TQFile::decodeName(SHELL_FILE)),
       		i18n("Unlisted Shell"),
       		i18n("&Add Shell"),
       		i18n("Do &Not Add"));
diff --git a/kuser/propdlg.h b/kuser/propdlg.h
index c71a535..d4fa163 100644
--- a/kuser/propdlg.h
+++ b/kuser/propdlg.h
@@ -27,7 +27,7 @@
 #include <tqlistbox.h>
 #include <tqtooltip.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 
 #include <klineedit.h>
@@ -70,7 +70,7 @@ protected:
   bool check();
   void loadgroups( bool fixedprivgroup );
   bool checkShell(const TQString &shell);
-  void addRow( TQWidget *parent, TQGridLayout *layout, int row, 
+  void addRow( TQWidget *parent, TQGridLayout *tqlayout, 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 *layout, int row, 
+  KIntSpinBox *addDaysGroup( TQWidget  *parent, TQGridLayout *tqlayout, int row, 
     const TQString &title, bool never=true );
 
   TQFrame *frontpage;
-  TQGridLayout *frontlayout;
+  TQGridLayout *fronttqlayout;
   int frontrow;
 
   TQPtrList<KU::KUser> mUsers;
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index 631c860..eb970d9 100644
--- a/kuser/pwddlg.cpp
+++ b/kuser/pwddlg.cpp
@@ -32,14 +32,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
 
   TQLabel* lb1 = new TQLabel(page, "lb1");
   lb1->setText(i18n("Password:"));
-  lb1->setMinimumSize(lb1->sizeHint());
-  lb1->setAlignment(AlignRight|AlignVCenter);
+  lb1->setMinimumSize(lb1->tqsizeHint());
+  lb1->tqsetAlignment(AlignRight|AlignVCenter);
 
   lepw1 = new KLineEdit(page, "LineEdit_1");
 
   // ensure it fits at least 12 characters
   lepw1->setText( "XXXXXXXXXXXX" );
-  lepw1->setMinimumSize(lepw1->sizeHint());
+  lepw1->setMinimumSize(lepw1->tqsizeHint());
 
   // clear text
   lepw1->clear();
@@ -48,14 +48,14 @@ pwddlg::pwddlg( TQWidget* parent, const char* name )
 
   TQLabel* lb2 = new TQLabel(page, "lb2");
   lb2->setText(i18n("Verify:"));
-  lb2->setMinimumSize(lb2->sizeHint());
-  lb2->setAlignment(AlignRight|AlignVCenter);
+  lb2->setMinimumSize(lb2->tqsizeHint());
+  lb2->tqsetAlignment(AlignRight|AlignVCenter);
 
   lepw2 = new KLineEdit(page, "LineEdit_2");
 
   // ensure it fits at least 12 characters
   lepw2->setText( "XXXXXXXXXXXX" );
-  lepw2->setMinimumSize(lepw2->sizeHint());
+  lepw2->setMinimumSize(lepw2->tqsizeHint());
 
   // clear text
   lepw2->clear();
diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp
index 69a9c30..9597ef2 100644
--- a/kuser/selectconn.cpp
+++ b/kuser/selectconn.cpp
@@ -17,7 +17,7 @@
  **/
 
 #include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <tqlabel.h>
 #include <tqgrid.h>
diff --git a/kuser/sid.cpp b/kuser/sid.cpp
index 4d5845b..8f3e254 100644
--- a/kuser/sid.cpp
+++ b/kuser/sid.cpp
@@ -74,7 +74,7 @@ bool SID::isEmpty() const
 
 void SID::updateSID()
 {
-  mSid = mDom + TQString::fromLatin1("-") + TQString::number( mRid );
+  mSid = mDom + TQString::tqfromLatin1("-") + TQString::number( mRid );
 }
 
 void SID::setSID( const TQString &sid )