From b09bffed6b43262948018dfb0f11890850ddf7c1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 20:34:22 +0000 Subject: TQt4 port kdeadmin This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kuser/kgroupfiles.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kuser/kgroupfiles.cpp') diff --git a/kuser/kgroupfiles.cpp b/kuser/kgroupfiles.cpp index cd4d2e0..1dacda2 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::null; + 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; @@ -271,12 +271,12 @@ bool KGroupFiles::save() if ( gr == 0 ) break; }; - if ( mDel.containsRef( gr ) ) { + if ( mDel.tqcontainsRef( gr ) ) { ++it; gr = (*it); continue; } - if ( mMod.contains( gr ) ) gr = &( mMod[ gr ] ); + if ( mMod.tqcontains( gr ) ) gr = &( mMod[ gr ] ); #ifdef HAVE_SHADOW if ( addok && !mCfg->gshadowsrc().isEmpty() ) @@ -284,8 +284,8 @@ bool KGroupFiles::save() #endif tmpGe = gr->getName(); - tmpGe.replace( ',', "_" ); - tmpGe.replace( ':', "_" ); + tmpGe.tqreplace( ',', "_" ); + tmpGe.tqreplace( ':', "_" ); gr->setName( tmpGe ); tmp_gid = gr->getGID(); @@ -298,8 +298,8 @@ bool KGroupFiles::save() tmpGe += ','; tmpSe += ','; } - gr->user( j ).replace( ',', "_" ); - gr->user( j ).replace( ':', "_" ); + gr->user( j ).tqreplace( ',', "_" ); + gr->user( j ).tqreplace( ':', "_" ); tmpGe += gr->user( j) ; tmpSe += gr->user( j ); } -- cgit v1.2.1