summaryrefslogtreecommitdiffstats
path: root/kinit/klauncher.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kinit/klauncher.cpp
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kinit/klauncher.cpp')
-rw-r--r--kinit/klauncher.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 3f5510ea0..8c66789e7 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -61,12 +61,12 @@
// Dispose slaves after being idle for SLAVE_MAX_IDLE seconds
#define SLAVE_MAX_IDLE 30
-using namespace KIO;
+using namespace TDEIO;
template class TQPtrList<KLaunchRequest>;
template class TQPtrList<IdleSlave>;
-IdleSlave::IdleSlave(KSocket *socket)
+IdleSlave::IdleSlave(TDESocket *socket)
{
mConn.init(socket);
mConn.connect(this, TQT_SLOT(gotInput()));
@@ -194,9 +194,9 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
domainname.close();
domainname.unlink();
#endif
- mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
- connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
- TQT_SLOT(acceptSlave(KSocket *)));
+ mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
+ connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
+ TQT_SLOT(acceptSlave(TDESocket *)));
connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
@@ -1353,7 +1353,7 @@ KLauncher::waitForSlave(pid_t pid)
}
void
-KLauncher::acceptSlave(KSocket *slaveSocket)
+KLauncher::acceptSlave(TDESocket *slaveSocket)
{
IdleSlave *slave = new IdleSlave(slaveSocket);
// Send it a SLAVE_STATUS command.