diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kded/khostname.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kded/khostname.cpp')
-rw-r--r-- | kded/khostname.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 3e9740054..0fa837a2c 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -82,7 +82,7 @@ KHostName::KHostName() display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); if (display.isEmpty()) { fprintf(stderr, "%s", i18n("Error: DISPLAY environment variable not set.\n").local8Bit().data()); @@ -145,14 +145,14 @@ void KHostName::changeX() TQCString authName = entries[1]; TQCString authKey = entries[2]; - int i = netId.tqfindRev(':'); + int i = netId.findRev(':'); if (i == -1) continue; TQCString netDisplay = netId.mid(i); if (netDisplay != display) continue; - i = netId.tqfind('/'); + i = netId.find('/'); if (i == -1) continue; @@ -208,7 +208,7 @@ void KHostName::changeDcop() if (!newName.isEmpty()) { - int i = line1.tqfindRev(':'); + int i = line1.findRev(':'); if (i == -1) { fprintf(stderr, "Warning: File '%s' has unexpected format.\n", fname.data()); @@ -286,7 +286,7 @@ void KHostName::changeDcop() // Remove old entries, but only if XAUTHLOCALHOSTNAME doesn't point // to it char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); - if (!xauthlocalhostname || !oldNetId.tqcontains(xauthlocalhostname)) + if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) { TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); system(TQFile::encodeName(cmd)); @@ -340,7 +340,7 @@ void KHostName::changeSessionManager() fprintf(stderr, "Warning: No session management specified.\n"); return; } - int i = sm.tqfindRev(':'); + int i = sm.findRev(':'); if ((i == -1) || (sm.left(6) != "local/")) { fprintf(stderr, "Warning: Session Management socket '%s' has unexpected format.\n", sm.data()); |