From 4816c4a735e1704c433dbe42155bf3887180d8ea Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 13:17:02 -0600
Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig,
 KIOBuffer, and KBuffer to avoid conflicts with KDE4

---
 kopete/protocols/msn/webcam.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kopete/protocols/msn/webcam.cpp')

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;
 	}
-- 
cgit v1.2.1