summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar/liboscar/client.cpp')
-rw-r--r--kopete/protocols/oscar/liboscar/client.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index 7cb994f8..00431434 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -21,7 +21,7 @@
#include "client.h"
#include <tqtimer.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kdebug.h> //for kdDebug()
#include <klocale.h>
@@ -98,7 +98,7 @@ public:
TQValueList<WORD> redirectionServices;
WORD currentRedirect;
TQByteArray cookie;
- DWORD connectAsStatus; // icq only
+ DWORD connectAstqStatus; // icq only
TQString connectWithMessage; // icq only
Oscar::Settings* settings;
@@ -128,7 +128,7 @@ public:
struct AwayMsgRequest
{
TQString contact;
- ICQStatus contactStatus;
+ ICQtqStatus contacttqStatus;
};
TQValueList<AwayMsgRequest> awayMsgRequestQueue;
TQTimer* awayMsgRequestTimer;
@@ -149,7 +149,7 @@ Client::Client( TQObject* parent )
d->isIcq = false; //default to AIM
d->redirectRequested = false;
d->currentRedirect = 0;
- d->connectAsStatus = 0x0; // default to online
+ d->connectAstqStatus = 0x0; // default to online
d->ssiManager = new SSIManager( this );
d->settings = new Oscar::Settings();
d->errorTask = 0L;
@@ -222,7 +222,7 @@ void Client::close()
//don't clear the stored status between stage one and two
if ( d->stage == ClientPrivate::StageTwo )
{
- d->connectAsStatus = 0x0;
+ d->connectAstqStatus = 0x0;
d->connectWithMessage = TQString();
}
@@ -233,7 +233,7 @@ void Client::close()
d->ssiManager->clear();
}
-void Client::setStatus( AIMStatus status, const TQString &_message )
+void Client::settqStatus( AIMtqStatus status, const TQString &_message )
{
// AIM: you're away exactly when your away message isn't empty.
// can't use TQString() as a message either; ProfileTask
@@ -257,7 +257,7 @@ void Client::setStatus( AIMStatus status, const TQString &_message )
pt->go( true );
}
-void Client::setStatus( DWORD status, const TQString &message )
+void Client::settqStatus( DWORD status, const TQString &message )
{
// remember the message to reply with, when requested
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting status message to "<< message << endl;
@@ -292,7 +292,7 @@ void Client::setStatus( DWORD status, const TQString &message )
}
else
{
- d->connectAsStatus = status;
+ d->connectAstqStatus = status;
d->connectWithMessage = message;
}
}
@@ -399,7 +399,7 @@ void Client::serviceSetupFinished()
d->active = true;
if ( isIcq() )
- setStatus( d->connectAsStatus, d->connectWithMessage );
+ settqStatus( d->connectAstqStatus, d->connectWithMessage );
d->ownStatusTask->go();
@@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact )
d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage );
}
-void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus )
+void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl;
Oscar::Message msg;
msg.setType( 2 );
msg.setReceiver( contact );
msg.addProperty( Oscar::Message::StatusMessageRequest );
- switch ( contactStatus )
+ switch ( contacttqStatus )
{
case ICQAway:
msg.setMessageType( 0xE8 ); // away
@@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactSt
sendMessage( msg );
}
-void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus )
+void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for "
<< contact << " to queue" << endl;
@@ -902,7 +902,7 @@ void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contac
//remove old request if still exists
removeICQAwayMessageRequest( contact );
- ClientPrivate::AwayMsgRequest amr = { contact, contactStatus };
+ ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus };
d->awayMsgRequestQueue.prepend( amr );
if ( !d->awayMsgRequestTimer->isActive() )
@@ -959,7 +959,7 @@ void Client::nextICQAwayMessageRequest()
amr = d->awayMsgRequestQueue.back();
d->awayMsgRequestQueue.pop_back();
- requestICQAwayMessage( amr.contact, amr.contactStatus );
+ requestICQAwayMessage( amr.contact, amr.contacttqStatus );
}
void Client::requestStatusInfo( const TQString& contact )
@@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo
else
{
realHost = host;
- realPort = TQString::fromLatin1("5190");
+ realPort = TQString::tqfromLatin1("5190");
}
Connection* c = createConnection( realHost, realPort );