1 files changed, 13 insertions, 13 deletions

diff --git a/krename/permission.cpp b/krename/permission.cpp
index 84a1382..12fa264 100644
--- a/krename/permission.cpp
+++ b/krename/permission.cpp
@@ -21,7 +21,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes
 #include <kapplication.h>
@@ -93,7 +93,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     gl->addWidget (la, 1, 2);
 
     la = new TQLabel( i18n("Exec"), groupPermission );
-    TQSize size = la->tqsizeHint();
+    TQSize size = la->sizeHint();
     size.setWidth(size.width() + 15);
     la->setFixedSize(size);
     gl->addWidget (la, 1, 3);
@@ -137,10 +137,10 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     groupOwner = new TQGroupBox ( i18n("Ownership"), w );
     groupOwner->setEnabled( FALSE );
     groupOwner->setColumnLayout(0, Qt::Vertical );
-    groupOwner->tqlayout()->setSpacing( 6 );
-    groupOwner->tqlayout()->setMargin( 11 );
-    groupOwnerLayout = new TQVBoxLayout( groupOwner->tqlayout() );
-    groupOwnerLayout->tqsetAlignment( TQt::AlignTop );
+    groupOwner->layout()->setSpacing( 6 );
+    groupOwner->layout()->setMargin( 11 );
+    groupOwnerLayout = new TQVBoxLayout( groupOwner->layout() );
+    groupOwnerLayout->setAlignment( TQt::AlignTop );
 
     Layout2 = new TQHBoxLayout( 0, 0, 6 );
     Layout3 = new TQHBoxLayout( 0, 0, 6 );
@@ -157,10 +157,10 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     setpwent();
     for (i=0; ((user = getpwent()) != 0L) && (i < MAXENTRIES); i++) {
         if( uid == 0 )
-            username->insertItem(TQString::tqfromLatin1(user->pw_name));
+            username->insertItem(TQString::fromLatin1(user->pw_name));
         else
             if( user->pw_uid == uid )
-                username->insertItem(TQString::tqfromLatin1(user->pw_name));
+                username->insertItem(TQString::fromLatin1(user->pw_name));
     }
     endpwent();
 
@@ -171,14 +171,14 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     setgrent();
     for (i=0; ((ge = getgrent()) != 0L) && (i < MAXENTRIES); i++) {
         if( uid == 0 ) {
-            groupname->insertItem(TQString::tqfromLatin1(ge->gr_name));
+            groupname->insertItem(TQString::fromLatin1(ge->gr_name));
         } else {
             char ** members = ge->gr_mem;
             char * member;
            
             while ((member = *members) != 0L) {
                 if (strUser == member) {
-                    groupname->insertItem(TQString::tqfromLatin1(ge->gr_name));
+                    groupname->insertItem(TQString::fromLatin1(ge->gr_name));
                     break;
                 }
 
@@ -191,7 +191,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
     /* add the users group */
     ge = getgrgid (getegid());
     if (ge) {
-        TQString name = TQString::tqfromLatin1(ge->gr_name);
+        TQString name = TQString::fromLatin1(ge->gr_name);
         if (name.isEmpty())
             name.setNum(ge->gr_gid);
 
@@ -245,11 +245,11 @@ TQString MyPermPlugin::processFile( BatchRenamer* b, int i, TQString, int )
     TQString filename = b->files()[i].dst.name;
     if( perm.changePermissions )
         if( chmod( (const char *)filename, (mode_t)perm.newPermission ) == -1 )
-            return TQString( i18n("Can't chmod %1.") ).tqarg(filename);
+            return TQString( i18n("Can't chmod %1.") ).arg(filename);
 
     if( perm.changeOwner )
         if( chown( (const char*)filename, getUid( perm.owner), getGid( perm.group )))
-            return TQString( i18n("Can't chown %1.") ).tqarg(filename);
+            return TQString( i18n("Can't chown %1.") ).arg(filename);
 
     return TQString();
 }