diff options
Diffstat (limited to 'kopete')
20 files changed, 53 insertions, 53 deletions
diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index e12284cf..62bd272a 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -33,7 +33,7 @@ KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ // reset close tracking flag mClosing = false; - mSocket = new KNetwork::KBufferedSocket; + mSocket = new KNetwork::TDEBufferedSocket; // make sure we get a signal whenever there's data to be read mSocket->enableRead ( true ); @@ -84,7 +84,7 @@ int KNetworkByteStream::tryWrite () } -KNetwork::KBufferedSocket *KNetworkByteStream::socket () const +KNetwork::TDEBufferedSocket *KNetworkByteStream::socket () const { return mSocket; diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h index 16e81389..ce7d458e 100644 --- a/kopete/protocols/groupwise/gwbytestream.h +++ b/kopete/protocols/groupwise/gwbytestream.h @@ -46,7 +46,7 @@ public: virtual bool isOpen () const; virtual void close (); - KNetwork::KBufferedSocket *socket () const; + KNetwork::TDEBufferedSocket *socket () const; signals: void connected (); @@ -62,7 +62,7 @@ private slots: void slotError ( int ); private: - KNetwork::KBufferedSocket *mSocket; + KNetwork::TDEBufferedSocket *mSocket; bool mClosing; }; diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 153b8ba8..5db30998 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -116,7 +116,7 @@ int KSSLSocket::bytesAvailable() const return -2; //Re-implemented because KExtSocket doesn't use this when not in buffered mode - return KBufferedIO::bytesAvailable(); + return TDEBufferedIO::bytesAvailable(); } void KSSLSocket::slotReadData() diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index 1021757d..f04518a6 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -32,7 +32,7 @@ JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ ) // reset close tracking flag mClosing = false; - mSocket = new KNetwork::KBufferedSocket; + mSocket = new KNetwork::TDEBufferedSocket; // make sure we get a signal whenever there's data to be read mSocket->enableRead ( true ); @@ -85,7 +85,7 @@ int JabberByteStream::tryWrite () } -KNetwork::KBufferedSocket *JabberByteStream::socket () const +KNetwork::TDEBufferedSocket *JabberByteStream::socket () const { return mSocket; diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index d72ce9ab..82f84bac 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -42,7 +42,7 @@ public: virtual bool isOpen () const; virtual void close (); - KNetwork::KBufferedSocket *socket () const; + KNetwork::TDEBufferedSocket *socket () const; signals: void connected (); @@ -58,7 +58,7 @@ private slots: void slotError ( int ); private: - KNetwork::KBufferedSocket *mSocket; + KNetwork::TDEBufferedSocket *mSocket; bool mClosing; }; diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index f78b253d..a4f31216 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -326,7 +326,7 @@ void IncomingTransfer::slotListenError(int /*errorCode*/) void IncomingTransfer::slotAccept() { // Try to accept an incoming connection from the sending client. - m_socket = static_cast<KBufferedSocket*>(m_listener->accept()); + m_socket = static_cast<TDEBufferedSocket*>(m_listener->accept()); if(!m_socket) { // NOTE If direct connection fails, the sending diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index f93af5c0..2496006b 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -101,9 +101,9 @@ void MSNSocket::connect( const TQString &server, uint port ) m_port = port; if(!m_useHttp) - m_socket = new KBufferedSocket( server, TQString::number(port) ); + m_socket = new TDEBufferedSocket( server, TQString::number(port) ); else { - m_socket = new KBufferedSocket( m_gateway, "80" ); + m_socket = new TDEBufferedSocket( m_gateway, "80" ); } m_socket->enableRead( true ); @@ -918,7 +918,7 @@ bool MSNSocket::accept( TDEServerSocket *server ) return false; } - m_socket = static_cast<KBufferedSocket*>(server->accept()); + m_socket = static_cast<TDEBufferedSocket*>(server->accept()); if ( !m_socket ) { diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index ad005396..5661ee41 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -31,7 +31,7 @@ #include "kopete_export.h" namespace KNetwork { - class KBufferedSocket; + class TDEBufferedSocket; class TDEServerSocket; } @@ -278,7 +278,7 @@ private: */ void parseLine( const TQString &str ); - KNetwork::KBufferedSocket *m_socket; + KNetwork::TDEBufferedSocket *m_socket; OnlineStatus m_onlineStatus; TQString m_server; diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index c2868ad0..ce34f4a9 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -338,7 +338,7 @@ void OutgoingTransfer::readyToSend() void OutgoingTransfer::connectToEndpoint(const TQString& hostName) { - m_socket = new KBufferedSocket(hostName, m_remotePort); + m_socket = new TDEBufferedSocket(hostName, m_remotePort); m_socket->setBlocking(false); m_socket->enableRead(true); // Disable write signal for now. Only enable diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h index e98e7364..55a7866a 100644 --- a/kopete/protocols/msn/p2p.h +++ b/kopete/protocols/msn/p2p.h @@ -28,7 +28,7 @@ namespace Kopete { class Transfer; } namespace Kopete { struct FileTransferInfo; } namespace P2P { class Dispatcher; } -namespace KNetwork { class KBufferedSocket; } +namespace KNetwork { class TDEBufferedSocket; } class TQFile; class KTempFile; @@ -139,7 +139,7 @@ namespace P2P{ P2P::MessageFormatter m_messageFormatter; TQString m_recipient; TQString m_sender; - KNetwork::KBufferedSocket *m_socket; + KNetwork::TDEBufferedSocket *m_socket; CommunicationState m_state; TransferType m_type; }; diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 1c5a8e3b..fde51060 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -381,7 +381,7 @@ void Webcam::processMessage(const Message& message) if(!port1.isNull()) { kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port1 << endl; - KBufferedSocket *sock=new KBufferedSocket( ip, port1, this ); + TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port1, this ); m_allSockets.append(sock); TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); @@ -391,7 +391,7 @@ void Webcam::processMessage(const Message& message) if(!port2.isNull()) { kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port2 << endl; - KBufferedSocket *sock=new KBufferedSocket( ip, port2, this ); + TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port2, this ); m_allSockets.append(sock); TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); @@ -400,17 +400,17 @@ void Webcam::processMessage(const Message& message) if(!port3.isNull()) { kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port3 << endl; - KBufferedSocket *sock=new KBufferedSocket( ip, port3, this ); + TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port3, this ); m_allSockets.append(sock); TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); sock->connect(ip, port3); } } - TQValueList<KBufferedSocket*>::iterator it; + TQValueList<TDEBufferedSocket*>::iterator it; for ( it = m_allSockets.begin(); it != m_allSockets.end(); ++it ) { - KBufferedSocket *sock=(*it); + TDEBufferedSocket *sock=(*it); //sock->enableRead( false ); kdDebug(14140) << k_funcinfo << "connect to " << sock << " - "<< sock->peerAddress().toString() << " ; " << sock->localAddress().toString() << endl; @@ -557,7 +557,7 @@ void Webcam::slotSocketConnected() { kdDebug(14140) << k_funcinfo <<"##########################" << endl; - m_webcamSocket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender())); + m_webcamSocket=const_cast<TDEBufferedSocket*>(static_cast<const TDEBufferedSocket*>(sender())); if(!m_webcamSocket) return; @@ -585,7 +585,7 @@ void Webcam::slotSocketConnected() void Webcam::slotAccept() { // Try to accept an incoming connection from the sending client. - m_webcamSocket = static_cast<KBufferedSocket*>(m_listener->accept()); + m_webcamSocket = static_cast<TDEBufferedSocket*>(m_listener->accept()); if(!m_webcamSocket) { // NOTE If direct connection fails, the sending @@ -620,7 +620,7 @@ void Webcam::slotAccept() void Webcam::slotSocketRead() { - m_webcamSocket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender())); + m_webcamSocket=const_cast<TDEBufferedSocket*>(static_cast<const TDEBufferedSocket*>(sender())); uint available = m_webcamSocket->bytesAvailable(); kdDebug(14140) << k_funcinfo << m_webcamSocket << "############# " << available << " bytes available." << endl; @@ -786,7 +786,7 @@ void Webcam::slotSocketClosed() if(!m_dispatcher) //we are in this destructor return; - KBufferedSocket *m_webcamSocket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender())); + TDEBufferedSocket *m_webcamSocket=const_cast<TDEBufferedSocket*>(static_cast<const TDEBufferedSocket*>(sender())); kdDebug(14140) << k_funcinfo << m_webcamSocket << endl; @@ -804,7 +804,7 @@ void Webcam::slotSocketClosed() void Webcam::slotSocketError(int errorCode) { - KBufferedSocket *socket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender())); + TDEBufferedSocket *socket=const_cast<TDEBufferedSocket*>(static_cast<const TDEBufferedSocket*>(sender())); kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->TDESocketBase::errorString() << endl; //sendBYEMessage(); } @@ -815,10 +815,10 @@ void Webcam::closeAllOtherSockets() delete m_listener; m_listener=0l; - TQValueList<KBufferedSocket*>::iterator it; + TQValueList<TDEBufferedSocket*>::iterator it; for ( it = m_allSockets.begin(); it != m_allSockets.end(); ++it ) { - KBufferedSocket *sock=(*it); + TDEBufferedSocket *sock=(*it); if(sock != m_webcamSocket) delete sock; } diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 64a555c5..a056fe24 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -18,7 +18,7 @@ #if MSN_WEBCAM -namespace KNetwork{ class TDEServerSocket; class KBufferedSocket; } +namespace KNetwork{ class TDEServerSocket; class TDEBufferedSocket; } class MimicWrapper; class TQLabel; @@ -55,7 +55,7 @@ class Webcam : public TransferContext KNetwork::TDEServerSocket *m_listener; - KNetwork::KBufferedSocket *m_webcamSocket; + KNetwork::TDEBufferedSocket *m_webcamSocket; enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; @@ -67,8 +67,8 @@ class Webcam : public TransferContext MimicWrapper *m_mimic; MSNWebcamDialog *m_widget; - TQValueList<KNetwork::KBufferedSocket* > m_allSockets; - TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates; + TQValueList<KNetwork::TDEBufferedSocket* > m_allSockets; + TQMap<KNetwork::TDEBufferedSocket*, WebcamStatus> m_webcamStates; int m_timerId; int m_timerFps; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index cffb672f..bed0a89e 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -32,7 +32,7 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) // reset close tracking flag mClosing = false; - mSocket = new KNetwork::KBufferedSocket; + mSocket = new KNetwork::TDEBufferedSocket; // make sure we get a signal whenever there's data to be read mSocket->enableRead( true ); @@ -79,7 +79,7 @@ int KNetworkByteStream::tryWrite () return writeData.size(); } -KNetwork::KBufferedSocket *KNetworkByteStream::socket() const +KNetwork::TDEBufferedSocket *KNetworkByteStream::socket() const { return mSocket; } diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index 15346ff0..df4085ab 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -46,7 +46,7 @@ public: virtual bool isOpen () const; virtual void close (); - KNetwork::KBufferedSocket *socket () const; + KNetwork::TDEBufferedSocket *socket () const; signals: void connected (); @@ -62,7 +62,7 @@ private slots: void slotError ( int ); private: - KNetwork::KBufferedSocket *mSocket; + KNetwork::TDEBufferedSocket *mSocket; bool mClosing; }; diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 543d0b5d..cd77498e 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -45,7 +45,7 @@ ModifyYABTask::~ModifyYABTask() void ModifyYABTask::onGo() { kdDebug(YAHOO_RAW_DEBUG) ; - m_socket = new KBufferedSocket( "address.yahoo.com", TQString::number(80) ); + m_socket = new TDEBufferedSocket( "address.yahoo.com", TQString::number(80) ); connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); @@ -91,13 +91,13 @@ void ModifyYABTask::connectFailed( int i) { m_socket->close(); client()->notifyError( i18n( "An error occurred while saving the address book entry." ), - TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); + TQString( "%1 - %2").arg(i).arg(static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() { kdDebug(YAHOO_RAW_DEBUG) ; - KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) ); + TDEBufferedSocket* socket = const_cast<TDEBufferedSocket*>( static_cast<const TDEBufferedSocket*>( sender() ) ); TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" "Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n" @@ -128,7 +128,7 @@ void ModifyYABTask::connectSucceeded() void ModifyYABTask::slotRead() { - KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) ); + TDEBufferedSocket* socket = const_cast<TDEBufferedSocket*>( static_cast<const TDEBufferedSocket*>( sender() ) ); TQByteArray ar( socket->bytesAvailable() ); socket->readBlock( ar.data (), ar.size () ); TQString data( ar ); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h index 3f1da297..bb646a55 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h @@ -26,7 +26,7 @@ namespace TDEIO { class TransferJob; } namespace KNetwork { - class KBufferedSocket; + class TDEBufferedSocket; } /** @@ -54,7 +54,7 @@ private slots: void slotRead(); private: TDEIO::TransferJob *m_transferJob; - KNetwork::KBufferedSocket *m_socket; + KNetwork::TDEBufferedSocket *m_socket; TQString m_postData; TQString m_data; Action m_action; diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 8c61daa7..a5f8f821 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -64,7 +64,7 @@ void SendPictureTask::onGo() void SendPictureTask::initiateUpload() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - m_socket = new KBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) ); + m_socket = new TDEBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) ); connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readResult() ) ); @@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload() void SendPictureTask::connectFailed( int i) { - kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const TDEBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error ); setError(); } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index 6a985665..2e16797f 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -26,7 +26,7 @@ namespace TDEIO { class TransferJob; } namespace KNetwork { - class KBufferedSocket; + class TDEBufferedSocket; } /** @@ -72,7 +72,7 @@ private: TQString m_url; int m_transmitted; TQFile *m_file; - KNetwork::KBufferedSocket *m_socket; + KNetwork::TDEBufferedSocket *m_socket; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index e1f5fd8c..c895bf5a 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -30,7 +30,7 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent ) // reset close tracking flag mClosing = false; - mSocket = new KNetwork::KBufferedSocket; + mSocket = new KNetwork::TDEBufferedSocket; // make sure we get a signal whenever there's data to be read mSocket->enableRead( true ); @@ -76,7 +76,7 @@ int KNetworkByteStream::tryWrite () return writeData.size(); } -KNetwork::KBufferedSocket *KNetworkByteStream::socket() const +KNetwork::TDEBufferedSocket *KNetworkByteStream::socket() const { return mSocket; } diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index f4ff3061..692c88be 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -43,7 +43,7 @@ public: virtual bool isOpen () const; virtual void close (); - KNetwork::KBufferedSocket *socket () const; + KNetwork::TDEBufferedSocket *socket () const; signals: void connected (); @@ -59,7 +59,7 @@ private slots: void slotError ( int ); private: - KNetwork::KBufferedSocket *mSocket; + KNetwork::TDEBufferedSocket *mSocket; bool mClosing; }; |