summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
Diffstat (limited to 'kinit')
-rw-r--r--kinit/kinit.cpp2
-rw-r--r--kinit/klauncher.cpp4
-rw-r--r--kinit/klauncher.h2
-rw-r--r--kinit/tests/klaunchertest.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index f34a6a219..b7588d280 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -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 ));
}
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 2b49a0ac8..7d09590f9 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -102,7 +102,7 @@ IdleSlave::gotInput()
pid_t pid;
TQCString protocol;
TQString host;
- Q_INT8 b;
+ TQ_INT8 b;
stream >> pid >> protocol >> host >> b;
// Overload with (bool) onHold, (KURL) url.
if (!stream.atEnd())
@@ -181,7 +181,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
objId(), "terminateKDE()", false );
TQString prefix = locateLocal("socket", "klauncher");
- KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
+ KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket"));
if (domainname.status() != 0)
{
// Sever error!
diff --git a/kinit/klauncher.h b/kinit/klauncher.h
index e681939e1..5ff5b66c3 100644
--- a/kinit/klauncher.h
+++ b/kinit/klauncher.h
@@ -39,7 +39,7 @@
#include "autostart.h"
-class IdleSlave : public QObject
+class IdleSlave : public TQObject
{
Q_OBJECT
public:
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp
index c42fdf686..ff1ae0fd1 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::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
+ TQString::tqfromLatin1("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::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid );
+ TQString::tqfromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid );
printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
result, error.ascii(), dcopService.data(), pid);