From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- quanta/components/csseditor/csseditor.h | 4 ++-- quanta/components/debugger/dbgp/dbgpnetwork.cpp | 10 +++++----- quanta/components/debugger/dbgp/dbgpnetwork.h | 2 +- quanta/components/debugger/gubed/quantadebuggergubed.cpp | 10 +++++----- quanta/components/debugger/gubed/quantadebuggergubed.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'quanta/components') diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index aee0695b..fa9e3339 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -26,7 +26,7 @@ #include class propertySetter; -class KConfig; +class TDEConfig; class KHTMLPart; class TQListViewItem; class TQDomNodeList; @@ -75,7 +75,7 @@ class CSSEditor : public CSSEditorS m_fileToPreview; bool m_isFileToPreviewExternal; - KConfig *m_config; + TDEConfig *m_config; //sourceFileName; 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; diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 3edcd527..872e1707 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -116,7 +116,7 @@ void QuantaDebuggerGubed::startSession() { if(!m_server) { - m_server = new KNetwork::KServerSocket(m_listenPort); + m_server = new KNetwork::TDEServerSocket(m_listenPort); m_server->setAddressReuseable(true); connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); @@ -250,7 +250,7 @@ void QuantaDebuggerGubed::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) + if(m_socket->error() == KNetwork::TDESocketBase::RemotelyDisconnected) { slotConnectionClosed(); return; @@ -258,8 +258,8 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; - debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false); + kdDebug(24002) << k_funcinfo << ", " << m_socket->TDESocketBase::errorString() << endl; + debuggerInterface()->showStatus(m_socket->TDESocketBase::errorString(), false); } } @@ -282,7 +282,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect? 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" << endl; diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 5b53f128..ead8ffd5 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -98,7 +98,7 @@ class QuantaDebuggerGubed : public DebuggerClient private: KNetwork::KStreamSocket *m_socket; - KNetwork::KServerSocket *m_server; + KNetwork::TDEServerSocket *m_server; TQString m_command, m_buffer; long m_datalen; -- cgit v1.2.1