diff options
Diffstat (limited to 'kinit/kinit.cpp')
| -rw-r--r-- | kinit/kinit.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index f34a6a219..94ca0fede 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -370,7 +370,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env s_instance->dirs()->findExe( exec, paths.join( TQString( ":" )))); if( avoid_loops && !execpath.isEmpty()) { - int pos = execpath.findRev( '/' ); + int pos = execpath.tqfindRev( '/' ); TQString bin_path = execpath.left( pos ); for( TQStringList::Iterator it = paths.begin(); it != paths.end(); @@ -456,7 +456,7 @@ static pid_t launch(int argc, const char *_name, const char *args, { lib = _name; name = _name; - name = name.mid( name.findRev('/') + 1); + name = name.mid( name.tqfindRev('/') + 1); exec = _name; if (lib.right(3) == ".la") libpath = lib; @@ -535,7 +535,7 @@ static pid_t launch(int argc, const char *_name, const char *args, ++it ) { TQCString tmp( it.current()); - int pos = tmp.find( '=' ); + int pos = tmp.tqfind( '=' ); if( pos >= 0 ) unsetenv( tmp.left( pos )); } @@ -586,7 +586,7 @@ static pid_t launch(int argc, const char *_name, const char *args, d.handle = 0; if (libpath.isEmpty() && execpath.isEmpty()) { - TQString errorMsg = i18n("Could not find '%1' executable.").arg(TQFile::decodeName(_name)); + TQString errorMsg = i18n("Could not tqfind '%1' executable.").arg(TQFile::decodeName(_name)); exitWithErrorMsg(errorMsg); } @@ -644,8 +644,8 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!d.sym ) { const char * ltdlError = lt_dlerror(); - fprintf(stderr, "Could not find kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" ); - TQString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2").arg(libpath) + fprintf(stderr, "Could not tqfind kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" ); + TQString errorMsg = i18n("Could not tqfind 'kdemain' in '%1'.\n%2").arg(libpath) .arg(ltdlError ? TQFile::decodeName(ltdlError) : i18n("Unknown error")); exitWithErrorMsg(errorMsg); } @@ -1477,16 +1477,16 @@ static void kdeinit_library_path() it++) { TQString d = *it; - if (ltdl_library_path.contains(d)) + if (ltdl_library_path.tqcontains(d)) continue; - if (ld_library_path.contains(d)) + if (ld_library_path.tqcontains(d)) continue; if (d[d.length()-1] == '/') { d.truncate(d.length()-1); - if (ltdl_library_path.contains(d)) + if (ltdl_library_path.tqcontains(d)) continue; - if (ld_library_path.contains(d)) + if (ld_library_path.tqcontains(d)) continue; } if ((d == "/lib") || (d == "/usr/lib")) @@ -1517,7 +1517,7 @@ static void kdeinit_library_path() exit(255); } int i; - if((i = display.findRev('.')) > display.findRev(':') && i >= 0) + if((i = display.tqfindRev('.')) > display.tqfindRev(':') && i >= 0) display.truncate(i); TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(display), s_instance)); @@ -1529,7 +1529,7 @@ static void kdeinit_library_path() } strcpy(sock_file_old, socketName.data()); - display.replace(":","_"); + display.tqreplace(":","_"); socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit_%1").arg(display), s_instance)); if (socketName.length() >= MAX_SOCK_FILE) { |