From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:36:20 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

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

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

diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 43b0f33e..1c5a8e3b 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio
 	m_mimic=0L;
 	m_widget=0L;
 
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "MSN" );
 
 	// Read the configuration to get the number of frame per second to send
@@ -509,7 +509,7 @@ TQString Webcam::xml(uint session , uint rid)
 
         TQString port = TQString::number(getAvailablePort());
 	
-	m_listener = new KServerSocket(port, this) ;
+	m_listener = new TDEServerSocket(port, this) ;
 	
 	return "<" + who + "><version>2.0</version><rid>"+TQString::number(rid)+"</rid><udprid>"+TQString::number(rid+1)+"</udprid><session>"+TQString::number(session)+"</session><ctypes>0</ctypes><cpu>2931</cpu>" +
 			"<tcp><tcpport>"+port+"</tcpport>\t\t\t\t\t\t\t\t  <tcplocalport>"+port+"</tcplocalport>\t\t\t\t\t\t\t\t  <tcpexternalport>"+port+"</tcpexternalport>"+ip+"</tcp>"+
@@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid)
 
 int Webcam::getAvailablePort()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "MSN" );
     TQString basePort=config->readEntry("WebcamPort");
     if(basePort.isEmpty() || basePort == "0" )
@@ -531,14 +531,14 @@ int Webcam::getAvailablePort()
 
 	// try to find an available port
 	//
-    KServerSocket *ss = new KServerSocket();
+    TDEServerSocket *ss = new TDEServerSocket();
     ss->setFamily(KResolver::InetFamily);
     bool found = false;
 	unsigned int port = firstport;
     for( ; port <= lastport; ++port) {
 		ss->setAddress( TQString::number( port ) );
 		bool success = ss->listen();
-		if( found = ( success && ss->error() == KSocketBase::NoError ) )
+		if( found = ( success && ss->error() == TDESocketBase::NoError ) )
 			break;
 		ss->close();
     }
@@ -805,7 +805,7 @@ void Webcam::slotSocketClosed()
 void Webcam::slotSocketError(int errorCode)
 {
 	KBufferedSocket *socket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender()));
-	kdDebug(14140) << k_funcinfo <<  socket << " -  " << errorCode << " : " << socket->KSocketBase::errorString() << endl;
+	kdDebug(14140) << k_funcinfo <<  socket << " -  " << errorCode << " : " << socket->TDESocketBase::errorString() << endl;
 	//sendBYEMessage();
 }
 
-- 
cgit v1.2.1