summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/msnsocket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/msn/msnsocket.cpp')
-rw-r--r--kopete/protocols/msn/msnsocket.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index e098e27b..f238a507 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -56,7 +56,7 @@ class MimeMessage
MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
{
- m_onlineStatus = Disconnected;
+ m_onlinetqStatus = Disconnected;
m_socket = 0L;
m_useHttp = false;
m_timer = 0L;
@@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
MSNSocket::~MSNSocket()
{
- //if ( m_onlineStatus != Disconnected )
+ //if ( m_onlinetqStatus != Disconnected )
// disconnect();
delete m_timer;
m_timer = 0L;
@@ -75,13 +75,13 @@ MSNSocket::~MSNSocket()
void MSNSocket::connect( const TQString &server, uint port )
{
- if ( m_onlineStatus == Connected || m_onlineStatus == Connecting )
+ if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting )
{
kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl;
return;
}
- if( m_onlineStatus == Disconnecting )
+ if( m_onlinetqStatus == Disconnecting )
{
// Cleanup first.
// FIXME: More generic!!!
@@ -166,10 +166,10 @@ void MSNSocket::doneDisconnect()
void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
{
- if ( m_onlineStatus == status )
+ if ( m_onlinetqStatus == status )
return;
- m_onlineStatus = status;
+ m_onlinetqStatus = status;
emit onlineStatusChanged( status );
}
@@ -183,7 +183,7 @@ void MSNSocket::slotSocketError( int error )
TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
if ( error == KSocketBase::LookupFailure )
- errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() );
+ errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().nodeName() );
else
errormsg += m_socket->KSocketBase::errorString() ;
@@ -594,7 +594,7 @@ void MSNSocket::handleError( uint code, uint /* id */ )
default:
// FIXME: if the error causes a disconnect, it will crash, but we can't disconnect every time
msg = i18n( "Unhandled MSN error code %1 \n"
- "Please fill a bug report with a detailed description and if possible the last console debug output." ).arg( code );
+ "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code );
// "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes."
break;
}
@@ -762,7 +762,7 @@ TQString MSNSocket::escape( const TQString &str )
for ( int i = 0; i < old_length; i++ )
{
- unsigned short character = str[i].unicode();
+ unsigned short character = str[i].tqunicode();
if( character <= 32 || character == '%' )
{
@@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed()
{
kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl;
- if ( !m_socket || m_onlineStatus == Disconnected )
+ if ( !m_socket || m_onlinetqStatus == Disconnected )
{
kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl;
return;
@@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
m_gateway = "gateway.messenger.hotmail.com";
}
- if ( m_onlineStatus != Disconnected )
+ if ( m_onlinetqStatus != Disconnected )
disconnect();
m_useHttp = useHttp;