1 files changed, 12 insertions, 12 deletions

diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index 775b837..b273d8d 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -408,7 +408,7 @@ void propdlg::setLE( KLineEdit *le, const TQString &val, bool first )
   if ( val.isEmpty() && le->text().isEmpty() ) return;
   if ( le->text() != val ) {
     le->setText( "" );
-    if ( !ro && mNoChanges.tqcontains( le ) ) {
+    if ( !ro && mNoChanges.contains( le ) ) {
       mNoChanges[ le ]->show();
       mNoChanges[ le ]->setChecked( true );
     }
@@ -437,7 +437,7 @@ void propdlg::setSB( KIntSpinBox *sb, int val, bool first )
   }
   if ( sb->value() != val ) {
     sb->setValue( 0 );
-    if ( !ro && mNoChanges.tqcontains( sb ) ) {
+    if ( !ro && mNoChanges.contains( sb ) ) {
       mNoChanges[ sb ]->show();
       mNoChanges[ sb ]->setChecked( true );
     }
@@ -485,7 +485,7 @@ void propdlg::selectuser()
     setLE( lefname, user->getFullName(), first );
     TQString home;
     home = user->getHomeDir();
-    if ( !one ) home.tqreplace( user->getName(), "%U" );
+    if ( !one ) home.replace( user->getName(), "%U" );
     setLE( lehome, home, first );
 
     TQString shell = user->getShell();
@@ -523,11 +523,11 @@ void propdlg::selectuser()
       setLE( leliscript, user->getLoginScript(), first );
       TQString profile;
       profile = user->getProfilePath();
-      if ( !one ) profile.tqreplace( user->getName(), "%U" );
+      if ( !one ) profile.replace( user->getName(), "%U" );
       setLE( leprofile, profile, first );
       setLE( lehomedrive, user->getHomeDrive(), first );
       home = user->getHomePath();
-      if ( !one ) home.tqreplace( user->getName(), "%U" );
+      if ( !one ) home.replace( user->getName(), "%U" );
       setLE( lehomepath, home, first );
       setLE( leworkstations, user->getWorkstations(), first );
       setLE( ledomain, user->getDomain(), first );
@@ -676,7 +676,7 @@ void propdlg::setpgroup()
 void propdlg::changed()
 {
   TQWidget *widget = (TQWidget*) sender();
-  if ( mNoChanges.tqcontains( widget ) ) mNoChanges[ widget ]->setChecked( false );
+  if ( mNoChanges.contains( widget ) ) mNoChanges[ widget ]->setChecked( false );
   ischanged = true;
   kdDebug() << "changed" << endl;
 }
@@ -689,14 +689,14 @@ void propdlg::gchanged()
 TQString propdlg::mergeLE( KLineEdit *le, const TQString &val, bool one )
 {
   TQCheckBox *cb = 0;
-  if ( mNoChanges.tqcontains( le ) ) cb = mNoChanges[ le ];
+  if ( mNoChanges.contains( le ) ) cb = mNoChanges[ le ];
   return ( one || ( cb && !cb->isChecked() ) ) ? le->text() : val;
 }
 
 int propdlg::mergeSB( KIntSpinBox *sb, int val, bool one )
 {
   TQCheckBox *cb = 0;
-  if ( mNoChanges.tqcontains( sb ) ) cb = mNoChanges[ sb ];
+  if ( mNoChanges.contains( sb ) ) cb = mNoChanges[ sb ];
   return ( one || ( cb && !cb->isChecked() ) ) ? sb->value() : val;
 }
 
@@ -745,11 +745,11 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser )
     newuser->setLoginScript( samba ? 
       mergeLE( leliscript, user->getLoginScript(), one ) : TQString()  );
     newuser->setProfilePath( samba ? 
-      mergeLE( leprofile, user->getProfilePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() );
+      mergeLE( leprofile, user->getProfilePath(), one ).replace( "%U", newuser->getName() ) : TQString() );
     newuser->setHomeDrive( samba ? 
       mergeLE( lehomedrive, user->getHomeDrive(), one ) : TQString() );
     newuser->setHomePath( samba ? 
-      mergeLE( lehomepath, user->getHomePath(), one ).tqreplace( "%U", newuser->getName() ) : TQString() );
+      mergeLE( lehomepath, user->getHomePath(), one ).replace( "%U", newuser->getName() ) : TQString() );
     newuser->setWorkstations( samba ? 
       mergeLE( leworkstations, user->getWorkstations(), one ) : TQString() );
     newuser->setDomain( samba ? 
@@ -768,7 +768,7 @@ void propdlg::mergeUser( KU::KUser *user, KU::KUser *newuser )
   }
 
   newuser->setHomeDir( posix ? 
-    mergeLE( lehome, user->getHomeDir(), one ).tqreplace( "%U", newuser->getName() ) : 
+    mergeLE( lehome, user->getHomeDir(), one ).replace( "%U", newuser->getName() ) : 
     TQString() );
   if ( posix ) {
     if ( leshell->currentItem() == 0 && ismoreshells ) {
@@ -870,7 +870,7 @@ bool propdlg::checkShell(const TQString &shell)
    if (shell.isEmpty())
       return true;
    TQStringList shells = readShells();
-   return shells.tqcontains(shell);
+   return shells.contains(shell);
 }
 
 bool propdlg::check()