summaryrefslogtreecommitdiffstats
path: root/kinit/klauncher.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-16 02:40:35 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-16 02:40:35 +0000
commitbab40890696ec68c337dc290880423a0602b83c7 (patch)
tree6ba03f720b1fa88235ba339e7aedb4455430357e /kinit/klauncher.cpp
parentf7e71d47719ab6094cf4a9fafffa5ea351973522 (diff)
downloadtdelibs-bab40890696ec68c337dc290880423a0602b83c7.tar.gz
tdelibs-bab40890696ec68c337dc290880423a0602b83c7.zip
Finished remaining porting to new TQt API
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kinit/klauncher.cpp')
-rw-r--r--kinit/klauncher.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 7d09590f9..0a27d5125 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -193,7 +193,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
domainname.close();
domainname.unlink();
#endif
- mPoolSocket = new KServerSocket(TQFile::encodeName(mPoolSocketName));
+ mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
TQT_SLOT(acceptSlave(KSocket *)));
@@ -740,7 +740,7 @@ KLauncher::requestDone(KLaunchRequest *request)
{
DCOPresult.result = 1;
DCOPresult.dcopName = "";
- DCOPresult.error = i18n("KDEInit could not launch '%1'.").arg(request->name);
+ DCOPresult.error = i18n("KDEInit could not launch '%1'.").arg(TQString(request->name));
if (!request->errorMsg.isEmpty())
DCOPresult.error += ":\n" + request->errorMsg;
DCOPresult.pid = 0;
@@ -892,7 +892,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
request->transaction = 0; // No confirmation is send
request->envs = envs;
// Find service, if any - strip path if needed
- KService::Ptr service = KService::serviceByDesktopName( name.mid( name.findRev( '/' ) + 1 ));
+ KService::Ptr service = KService::serviceByDesktopName( name.mid( name.tqfindRev( '/' ) + 1 ));
if (service != NULL)
send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >());
@@ -1164,7 +1164,7 @@ KLauncher::kdeinit_exec(const TQString &app, const TQStringList &args,
if( app != "kbuildsycoca" ) // avoid stupid loop
{
// Find service, if any - strip path if needed
- KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
+ KService::Ptr service = KService::serviceByDesktopName( app.mid( app.tqfindRev( '/' ) + 1 ));
if (service != NULL)
send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >());
@@ -1331,7 +1331,7 @@ KLauncher::requestSlave(const TQString &protocol,
requestDone(request);
if (!pid)
{
- error = i18n("Error loading '%1'.\n").arg(name);
+ error = i18n("Error loading '%1'.\n").arg(TQString(name));
}
return pid;
}