From e2867c1f1eec514d56386f2fc5350eaaf760532a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:32:40 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit 984c25aa6969e55896e9a13c8e7f7b8a58991a4e) --- kinit/klauncher.cpp | 2 +- kinit/tests/klaunchertest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kinit') diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 4f2e12450..c3ee59f02 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -182,7 +182,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) objId(), "terminateKDE()", false ); TQString prefix = locateLocal("socket", "klauncher"); - KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket")); + KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); if (domainname.status() != 0) { // Sever error! diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp index ff1ae0fd1..c42fdf686 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/klaunchertest.cpp @@ -39,13 +39,13 @@ int main(int argc, char *argv[]) TQCString dcopService; int pid; int result = KApplication::startServiceByDesktopName( - TQString::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); + TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); result = KApplication::startServiceByDesktopName( - TQString::tqfromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); + TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); -- cgit v1.2.1