Rename old tq methods that no longer need a unique name

16 files changed, 34 insertions, 34 deletions

diff --git a/kuser/filessettings.ui b/kuser/filessettings.ui
index abbafb6..83a8827 100644
--- a/kuser/filessettings.ui
+++ b/kuser/filessettings.ui
@@ -212,7 +212,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui
index ed650d2..8c6eb91 100644
--- a/kuser/generalsettings.ui
+++ b/kuser/generalsettings.ui
@@ -200,7 +200,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/kgroup.cpp b/kuser/kgroup.cpp
index dbbff91..77fcc91 100644
--- a/kuser/kgroup.cpp
+++ b/kuser/kgroup.cpp
@@ -28,7 +28,7 @@
 
 KU::KGroup::KGroup()
 {
-  pwd = TQString::tqfromLatin1("*");
+  pwd = TQString::fromLatin1("*");
   gid = 0;
   type = 2;
   caps = 0;
diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp
index 4534ac5..eed0ee5 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.").
-        tqarg(filename).tqarg(TQString::tqfromLatin1(strerror(errno))) );
+        tqarg(filename).tqarg(TQString::fromLatin1(strerror(errno))) );
       if( (processing_file & GROUP) != 0 ) {
         group_errno = errno;
         if(!nisgroup_filename.isEmpty()) {
@@ -194,16 +194,16 @@ bool KGroupFiles::save()
   // read KUser configuration info
 
   group_filename = mCfg->groupsrc();
-  new_group_filename = group_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+  new_group_filename = group_filename + TQString::fromLatin1(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::tqfromLatin1(KU_CREATE_EXT);
+      new_gshadow_filename = gshadow_filename + TQString::fromLatin1(KU_CREATE_EXT);
 #endif
   nisgroup_filename = mCfg->nisgroupsrc();
-  new_nisgroup_filename = nisgroup_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+  new_nisgroup_filename = nisgroup_filename + TQString::fromLatin1(KU_CREATE_EXT);
   if( nisgroup_filename != group_filename ) {
     mingid = mCfg->nismingid();
   }
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index cfd3e49..6369ee7 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -651,8 +651,8 @@ void KU::KUser::copyDir(const TQString &srcPath, const TQString &dstPath)
   TQDir s(srcPath);
   TQDir d(dstPath);
 
-  TQString dot = TQString::tqfromLatin1(".");
-  TQString dotdot = TQString::tqfromLatin1("..");
+  TQString dot = TQString::fromLatin1(".");
+  TQString dotdot = TQString::fromLatin1("..");
   
   s.setFilter( TQDir::All | TQDir::Hidden | TQDir::System );
 
@@ -772,7 +772,7 @@ int KU::KUser::removeCrontabs()
 
   file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name;
   if ( access(TQFile::encodeName(file), F_OK) == 0 ) {
-    command = TQString::tqfromLatin1("crontab -u %1 -r").tqarg(KProcess::quote(p_name));
+    command = TQString::fromLatin1("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")
                   .tqarg(command).tqarg(TQString::fromLocal8Bit(strerror(errno))) );
diff --git a/kuser/kuserfiles.cpp b/kuser/kuserfiles.cpp
index 868f100..cc67a8a 100644
--- a/kuser/kuserfiles.cpp
+++ b/kuser/kuserfiles.cpp
@@ -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::tqfromLatin1(p->pw_class));
+      tmpKU->setClass(TQString::fromLatin1(p->pw_class));
       tmpKU->setLastChange(p->pw_change);
       tmpKU->setExpire(p->pw_expire);
 #endif
@@ -314,9 +314,9 @@ bool KUserFiles::savepwd()
   passwd_filename = mCfg->passwdsrc();
   nispasswd_filename = mCfg->nispasswdsrc();
   TQString new_passwd_filename =
-    passwd_filename + TQString::tqfromLatin1(KU_CREATE_EXT);
+    passwd_filename + TQString::fromLatin1(KU_CREATE_EXT);
   TQString new_nispasswd_filename =
-    nispasswd_filename+TQString::tqfromLatin1(KU_CREATE_EXT);
+    nispasswd_filename+TQString::fromLatin1(KU_CREATE_EXT);
 
   if( nispasswd_filename != passwd_filename ) {
     minuid = mCfg->nisminuid();
@@ -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::tqfromLatin1(KU_CREATE_EXT);
+  TQString new_shadow_file = shadow_file+TQString::fromLatin1(KU_CREATE_EXT);
 
   if ( shadow_file.isEmpty() )
     return TRUE;
@@ -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::tqfromLatin1("x") );
+    user->setPwd( TQString::fromLatin1("x") );
   } else
     user->setPwd( encryptPass( password, false ) );
 }
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index 5d4979a..d661e35 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::tqfromLatin1( (const char*) &hex, 32 ) );
+    user->setNTPwd( TQString::fromLatin1( (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::tqfromLatin1( (const char*) &hex, 32 ) );
+      user->setLMPwd( TQString::fromLatin1( (const char*) &hex, 32 ) );
     } else {
       user->setLMPwd( "" );
     }
@@ -372,7 +372,7 @@ void KUserLDAP::getLDIF( KU::KUser *user, bool mod )
   cn = mCfg->ldapcnfullname() ? user->getFullName() : user->getName();
   if ( cn.isEmpty() ) cn = user->getName();
 
-  gecos = TQString::tqfromLatin1("%1,%2,%3,%4")
+  gecos = TQString::fromLatin1("%1,%2,%3,%4")
     .tqarg(user->getFullName())
     .tqarg(user->getOffice1())
     .tqarg(user->getOffice2())
diff --git a/kuser/kusersystem.cpp b/kuser/kusersystem.cpp
index 584bd74..8c67fcb 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::tqfromLatin1(p->pw_class));
+    tmpKU->setClass(TQString::fromLatin1(p->pw_class));
     tmpKU->setLastChange(p->pw_change);
     tmpKU->setExpire(p->pw_expire);
 #endif
diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui
index 7d962f6..578894a 100644
--- a/kuser/ldapsamba.ui
+++ b/kuser/ldapsamba.ui
@@ -264,7 +264,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -283,7 +283,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kuser/ldapsettings.ui b/kuser/ldapsettings.ui
index 575ea2f..fa24b2a 100644
--- a/kuser/ldapsettings.ui
+++ b/kuser/ldapsettings.ui
@@ -253,7 +253,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp
index 95524f3..0f3dfbd 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::tqfromLatin1(x))
+#define BarIconC(x)	BarIcon(TQString::fromLatin1(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 2e1ebab..659ff73 100644
--- a/kuser/misc.cpp
+++ b/kuser/misc.cpp
@@ -37,7 +37,7 @@
 
 bool backup(const TQString & name)
 {
-  TQString tmp = name + TQString::tqfromLatin1(KU_BACKUP_EXT);
+  TQString tmp = name + TQString::fromLatin1(KU_BACKUP_EXT);
   TQFile::remove( tmp );
 
   if (copyFile(TQFile::encodeName(name), TQFile::encodeName(tmp)) == -1)
diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui
index a68d629..4893e04 100644
--- a/kuser/passwordpolicy.ui
+++ b/kuser/passwordpolicy.ui
@@ -206,7 +206,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp
index dbd73d0..cd431c0 100644
--- a/kuser/propdlg.cpp
+++ b/kuser/propdlg.cpp
@@ -43,8 +43,8 @@ void propdlg::addRow(TQWidget *parent, TQGridLayout *tqlayout, int row,
   bool two_column, bool nochange)
 {
    TQLabel *lab = new TQLabel(widget, label, parent);
-   lab->setMinimumSize(lab->tqsizeHint());
-   widget->setMinimumSize(widget->tqsizeHint());
+   lab->setMinimumSize(lab->sizeHint());
+   widget->setMinimumSize(widget->sizeHint());
    tqlayout->addWidget(lab, row, 0);
    if (!what.isEmpty())
    {
diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp
index eb970d9..631c860 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->tqsizeHint());
-  lb1->tqsetAlignment(AlignRight|AlignVCenter);
+  lb1->setMinimumSize(lb1->sizeHint());
+  lb1->setAlignment(AlignRight|AlignVCenter);
 
   lepw1 = new KLineEdit(page, "LineEdit_1");
 
   // ensure it fits at least 12 characters
   lepw1->setText( "XXXXXXXXXXXX" );
-  lepw1->setMinimumSize(lepw1->tqsizeHint());
+  lepw1->setMinimumSize(lepw1->sizeHint());
 
   // 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->tqsizeHint());
-  lb2->tqsetAlignment(AlignRight|AlignVCenter);
+  lb2->setMinimumSize(lb2->sizeHint());
+  lb2->setAlignment(AlignRight|AlignVCenter);
 
   lepw2 = new KLineEdit(page, "LineEdit_2");
 
   // ensure it fits at least 12 characters
   lepw2->setText( "XXXXXXXXXXXX" );
-  lepw2->setMinimumSize(lepw2->tqsizeHint());
+  lepw2->setMinimumSize(lepw2->sizeHint());
 
   // clear text
   lepw2->clear();
diff --git a/kuser/sid.cpp b/kuser/sid.cpp
index 8f3e254..4d5845b 100644
--- a/kuser/sid.cpp
+++ b/kuser/sid.cpp
@@ -74,7 +74,7 @@ bool SID::isEmpty() const
 
 void SID::updateSID()
 {
-  mSid = mDom + TQString::tqfromLatin1("-") + TQString::number( mRid );
+  mSid = mDom + TQString::fromLatin1("-") + TQString::number( mRid );
 }
 
 void SID::setSID( const TQString &sid )