diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:39:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:39:24 -0600 |
| commit | f9ced3b3f13f3136ef63c33ef163042010d6e80b (patch) | |
| tree | 293ce93dfb0dcfd79f83674116d7b3bc56f29af2 /quanta/components/debugger/dbgp | |
| parent | 29df04c24350cc76a41e2410d1c92445f9338b98 (diff) | |
| download | tdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.tar.gz tdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'quanta/components/debugger/dbgp')
| -rw-r--r-- | quanta/components/debugger/dbgp/dbgpnetwork.cpp | 10 | ||||
| -rw-r--r-- | quanta/components/debugger/dbgp/dbgpnetwork.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index a087ae03..4454f0d7 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -62,7 +62,7 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt { if(!m_server) { - m_server = new KNetwork::KServerSocket(service); + m_server = new KNetwork::TDEServerSocket(service); m_server->setAddressReuseable(true); connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); @@ -118,8 +118,8 @@ void DBGpNetwork::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; - if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) + kdDebug(24002) << k_funcinfo << ", " << m_socket->TDESocketBase::errorString() << endl; + if(m_socket->error() == KNetwork::TDESocketBase::RemotelyDisconnected) { slotConnectionClosed(); emit networkError(i18n("Disconnected from remote host"), true); @@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int) if(m_socket->error()) { - emit networkError(m_socket->KSocketBase::errorString(), true); + emit networkError(m_socket->TDESocketBase::errorString(), true); } } @@ -148,7 +148,7 @@ void DBGpNetwork::slotReadyAccept() { disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // KSocketServer returns a KStreamSocket (!) + m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) { kdDebug(24002) << k_funcinfo << ", ready" << ", m_socket" << m_socket << endl; diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 8cce9d6a..1ac8e2f4 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -35,7 +35,7 @@ class DBGpNetwork : public TQObject private: KNetwork::KStreamSocket *m_socket; - KNetwork::KServerSocket *m_server; + KNetwork::TDEServerSocket *m_server; TQByteArrayFifo m_fifo; bool m_useproxy; long m_datalen; |