summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/msn')
-rw-r--r--kopete/protocols/msn/incomingtransfer.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp6
-rw-r--r--kopete/protocols/msn/msnsocket.h4
-rw-r--r--kopete/protocols/msn/outgoingtransfer.cpp2
-rw-r--r--kopete/protocols/msn/p2p.h4
-rw-r--r--kopete/protocols/msn/webcam.cpp24
-rw-r--r--kopete/protocols/msn/webcam.h8
7 files changed, 25 insertions, 25 deletions
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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 10:09:39 +0000