summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar/liboscar')
-rw-r--r--kopete/protocols/oscar/liboscar/aimlogintask.cpp24
-rw-r--r--kopete/protocols/oscar/liboscar/aimlogintask.h18
-rw-r--r--kopete/protocols/oscar/liboscar/blmlimitstask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/buddyicontask.cpp28
-rw-r--r--kopete/protocols/oscar/liboscar/buddyicontask.h16
-rw-r--r--kopete/protocols/oscar/liboscar/buffer.cpp74
-rw-r--r--kopete/protocols/oscar/liboscar/buffer.h42
-rw-r--r--kopete/protocols/oscar/liboscar/bytestream.cpp34
-rw-r--r--kopete/protocols/oscar/liboscar/bytestream.h28
-rw-r--r--kopete/protocols/oscar/liboscar/changevisibilitytask.cpp16
-rw-r--r--kopete/protocols/oscar/liboscar/chatnavservicetask.cpp36
-rw-r--r--kopete/protocols/oscar/liboscar/chatnavservicetask.h12
-rw-r--r--kopete/protocols/oscar/liboscar/chatservicetask.cpp48
-rw-r--r--kopete/protocols/oscar/liboscar/chatservicetask.h14
-rw-r--r--kopete/protocols/oscar/liboscar/client.cpp308
-rw-r--r--kopete/protocols/oscar/liboscar/client.h154
-rw-r--r--kopete/protocols/oscar/liboscar/clientreadytask.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/clientreadytask.h8
-rw-r--r--kopete/protocols/oscar/liboscar/closeconnectiontask.cpp20
-rw-r--r--kopete/protocols/oscar/liboscar/closeconnectiontask.h16
-rw-r--r--kopete/protocols/oscar/liboscar/connection.cpp22
-rw-r--r--kopete/protocols/oscar/liboscar/connection.h22
-rw-r--r--kopete/protocols/oscar/liboscar/connectionhandler.cpp32
-rw-r--r--kopete/protocols/oscar/liboscar/connectionhandler.h14
-rw-r--r--kopete/protocols/oscar/liboscar/connector.cpp10
-rw-r--r--kopete/protocols/oscar/liboscar/connector.h14
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.cpp38
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.h18
-rw-r--r--kopete/protocols/oscar/liboscar/flapprotocol.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/flapprotocol.h4
-rw-r--r--kopete/protocols/oscar/liboscar/icbmparamstask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/icqlogintask.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/icqlogintask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/icqtask.cpp10
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfo.cpp18
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfo.h98
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfotask.cpp16
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfotask.h42
-rw-r--r--kopete/protocols/oscar/liboscar/inputprotocolbase.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/inputprotocolbase.h12
-rw-r--r--kopete/protocols/oscar/liboscar/locationrightstask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/logintask.cpp24
-rw-r--r--kopete/protocols/oscar/liboscar/logintask.h28
-rw-r--r--kopete/protocols/oscar/liboscar/messagereceivertask.cpp32
-rw-r--r--kopete/protocols/oscar/liboscar/messagereceivertask.h10
-rw-r--r--kopete/protocols/oscar/liboscar/offlinemessagestask.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/onlinenotifiertask.h4
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.cpp20
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.h4
-rw-r--r--kopete/protocols/oscar/liboscar/oscarclientstream.cpp74
-rw-r--r--kopete/protocols/oscar/liboscar/oscarclientstream.h16
-rw-r--r--kopete/protocols/oscar/liboscar/oscarconnector.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/oscarconnector.h8
-rw-r--r--kopete/protocols/oscar/liboscar/oscarmessage.cpp56
-rw-r--r--kopete/protocols/oscar/liboscar/oscarmessage.h56
-rw-r--r--kopete/protocols/oscar/liboscar/oscartypeclasses.cpp56
-rw-r--r--kopete/protocols/oscar/liboscar/oscartypeclasses.h40
-rw-r--r--kopete/protocols/oscar/liboscar/oscartypes.h28
-rw-r--r--kopete/protocols/oscar/liboscar/oscarutils.cpp38
-rw-r--r--kopete/protocols/oscar/liboscar/oscarutils.h26
-rw-r--r--kopete/protocols/oscar/liboscar/ownuserinfotask.cpp10
-rw-r--r--kopete/protocols/oscar/liboscar/ownuserinfotask.h4
-rw-r--r--kopete/protocols/oscar/liboscar/prmparamstask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/profiletask.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/profiletask.h8
-rw-r--r--kopete/protocols/oscar/liboscar/rateclass.cpp18
-rw-r--r--kopete/protocols/oscar/liboscar/rateclass.h18
-rw-r--r--kopete/protocols/oscar/liboscar/rateclassmanager.cpp24
-rw-r--r--kopete/protocols/oscar/liboscar/rateclassmanager.h8
-rw-r--r--kopete/protocols/oscar/liboscar/rateinfotask.cpp18
-rw-r--r--kopete/protocols/oscar/liboscar/rateinfotask.h4
-rw-r--r--kopete/protocols/oscar/liboscar/rtf.cc40
-rw-r--r--kopete/protocols/oscar/liboscar/rtf2html.h20
-rw-r--r--kopete/protocols/oscar/liboscar/safedelete.cpp16
-rw-r--r--kopete/protocols/oscar/liboscar/safedelete.h16
-rw-r--r--kopete/protocols/oscar/liboscar/senddcinfotask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/sendidletimetask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/sendmessagetask.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/sendmessagetask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/serverredirecttask.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/serverredirecttask.h22
-rw-r--r--kopete/protocols/oscar/liboscar/serverversionstask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/serverversionstask.h4
-rw-r--r--kopete/protocols/oscar/liboscar/servicesetuptask.cpp20
-rw-r--r--kopete/protocols/oscar/liboscar/snacprotocol.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/snacprotocol.h4
-rw-r--r--kopete/protocols/oscar/liboscar/ssiactivatetask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/ssiauthtask.cpp26
-rw-r--r--kopete/protocols/oscar/liboscar/ssiauthtask.h14
-rw-r--r--kopete/protocols/oscar/liboscar/ssilisttask.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/ssimanager.cpp96
-rw-r--r--kopete/protocols/oscar/liboscar/ssimanager.h42
-rw-r--r--kopete/protocols/oscar/liboscar/ssimodifytask.cpp54
-rw-r--r--kopete/protocols/oscar/liboscar/ssimodifytask.h12
-rw-r--r--kopete/protocols/oscar/liboscar/ssiparamstask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/stream.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/stream.h6
-rw-r--r--kopete/protocols/oscar/liboscar/task.cpp36
-rw-r--r--kopete/protocols/oscar/liboscar/task.h10
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp10
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ipaddrtest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.cpp30
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.h12
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/redirecttest.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/redirecttest.h8
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp16
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.cpp24
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/tester.h32
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.cpp14
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.h6
-rw-r--r--kopete/protocols/oscar/liboscar/transfer.cpp36
-rw-r--r--kopete/protocols/oscar/liboscar/transfer.h12
-rw-r--r--kopete/protocols/oscar/liboscar/typingnotifytask.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/typingnotifytask.h10
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.cpp56
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.h24
-rw-r--r--kopete/protocols/oscar/liboscar/userinfotask.cpp22
-rw-r--r--kopete/protocols/oscar/liboscar/userinfotask.h16
-rw-r--r--kopete/protocols/oscar/liboscar/usersearchtask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/usersearchtask.h8
-rw-r--r--kopete/protocols/oscar/liboscar/warningtask.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/warningtask.h8
129 files changed, 1459 insertions, 1459 deletions
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 69a9c770..da066333 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -43,7 +43,7 @@ void AimLoginTask::onGo()
//send Snac 17,06
sendAuthStringRequest();
//when we have the authKey, login
- connect( this, SIGNAL( haveAuthKey() ), this, SLOT( sendLoginRequest() ) );
+ connect( this, TQT_SIGNAL( haveAuthKey() ), this, TQT_SLOT( sendLoginRequest() ) );
}
bool AimLoginTask::forMe( Transfer* transfer ) const
@@ -72,17 +72,17 @@ bool AimLoginTask::forMe( Transfer* transfer ) const
return false;
}
-const QByteArray& AimLoginTask::cookie() const
+const TQByteArray& AimLoginTask::cookie() const
{
return m_cookie;
}
-const QString& AimLoginTask::bosHost() const
+const TQString& AimLoginTask::bosHost() const
{
return m_bosHost;
}
-const QString& AimLoginTask::bosPort() const
+const TQString& AimLoginTask::bosPort() const
{
return m_bosPort;
}
@@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest()
outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1());
- QByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long
+ TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long
encodePassword( digest );
digest[16] = '\0'; //do this so that addTLV sees a NULL-terminator
@@ -189,16 +189,16 @@ void AimLoginTask::handleLoginResponse()
if ( !st )
{
- setError( -1 , QString::null );
+ setError( -1 , TQString::null );
return;
}
- QValueList<TLV> tlvList = st->buffer()->getTLVList();
+ TQValueList<TLV> tlvList = st->buffer()->getTLVList();
TLV uin = findTLV( tlvList, 0x0001 );
if ( uin )
{
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(1) [SN], SN=" << QString( uin.data ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(1) [SN], SN=" << TQString( uin.data ) << endl;
}
TLV err = findTLV( tlvList, 0x0008 );
@@ -211,14 +211,14 @@ void AimLoginTask::handleLoginResponse()
errorNum << endl;
Oscar::SNAC s = { 0, 0, 0, 0 };
client()->fatalTaskError( s, errorNum );
- setError( errorNum, QString::null );
+ setError( errorNum, TQString::null );
return; //if there's an error, we'll need to disconnect anyways
}
TLV server = findTLV( tlvList, 0x0005 );
if ( server )
{
- QString ip = QString( server.data );
+ TQString ip = TQString( server.data );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << ip << endl;
int index = ip.find( ':' );
m_bosHost = ip.left( index );
@@ -233,12 +233,12 @@ void AimLoginTask::handleLoginResponse()
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(6) [COOKIE]" << endl;
m_cookie.duplicate( cookie.data );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
tlvList.clear();
}
-void AimLoginTask::encodePassword( QByteArray& digest ) const
+void AimLoginTask::encodePassword( TQByteArray& digest ) const
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
md5_state_t state;
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h
index 66308178..cc564592 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.h
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.h
@@ -33,9 +33,9 @@ public:
virtual void onGo();
//Protocol specific stuff
- const QByteArray& cookie() const;
- const QString& bosHost() const;
- const QString& bosPort() const;
+ const TQByteArray& cookie() const;
+ const TQString& bosHost() const;
+ const TQString& bosPort() const;
protected:
bool forMe( Transfer* transfer ) const;
@@ -45,7 +45,7 @@ signals:
private:
//! Encodes a password using MD5
- void encodePassword( QByteArray& digest ) const;
+ void encodePassword( TQByteArray& digest ) const;
//! Send SNAC 0x17, 0x06
void sendAuthStringRequest();
@@ -58,7 +58,7 @@ private:
//! Parse the error codes to generate a reason why sign-on failed
//Massive code duplication with CloseConnectionTask
- bool parseDisconnectCode( int error, QString& reason );
+ bool parseDisconnectCode( int error, TQString& reason );
private slots:
//! Send SNAC 0x17, 0x02
@@ -66,16 +66,16 @@ private slots:
private:
//! The authorization key to use when encoding the password
- QByteArray m_authKey;
+ TQByteArray m_authKey;
//! The all important connection cookie
- QByteArray m_cookie;
+ TQByteArray m_cookie;
//! The new BOS Host
- QString m_bosHost;
+ TQString m_bosHost;
//! The new BOS Port
- QString m_bosPort;
+ TQString m_bosPort;
};
diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp
index c3fe7e6e..0b866de8 100644
--- a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp
+++ b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp
@@ -71,7 +71,7 @@ bool BLMLimitsTask::take(Transfer* transfer)
break;
}
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return true;
}
else
diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp
index 1828b7b9..facaae1a 100644
--- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp
+++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp
@@ -19,7 +19,7 @@
#include "buddyicontask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "buffer.h"
#include "connection.h"
@@ -36,20 +36,20 @@ BuddyIconTask::BuddyIconTask( Task* parent )
m_hashType = 0;
}
-void BuddyIconTask::uploadIcon( WORD length, const QByteArray& data )
+void BuddyIconTask::uploadIcon( WORD length, const TQByteArray& data )
{
m_iconLength = length;
m_icon = data;
m_action = Send;
}
-void BuddyIconTask::requestIconFor( const QString& user )
+void BuddyIconTask::requestIconFor( const TQString& user )
{
m_user = user;
m_action = Receive;
}
-void BuddyIconTask::setHash( const QByteArray& md5Hash )
+void BuddyIconTask::setHash( const TQByteArray& md5Hash )
{
m_hash = md5Hash;
}
@@ -125,7 +125,7 @@ bool BuddyIconTask::take( Transfer* transfer )
else
handleICQBuddyIconResponse();
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return true;
}
@@ -150,10 +150,10 @@ void BuddyIconTask::handleUploadResponse()
Buffer* b = transfer()->buffer();
b->skipBytes( 4 );
BYTE iconHashSize = b->getByte();
- QByteArray hash( b->getBlock( iconHashSize ) );
+ TQByteArray hash( b->getBlock( iconHashSize ) );
//check the hash
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "hash " << hash << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
@@ -178,16 +178,16 @@ void BuddyIconTask::sendAIMBuddyIconRequest()
void BuddyIconTask::handleAIMBuddyIconResponse()
{
Buffer* b = transfer()->buffer();
- QString user = b->getBUIN();
+ TQString user = b->getBUIN();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Receiving buddy icon for " << user << endl;
b->skipBytes(2); //unknown field. not used
BYTE iconType = b->getByte();
Q_UNUSED( iconType );
BYTE hashSize = b->getByte();
- QByteArray iconHash;
+ TQByteArray iconHash;
iconHash.duplicate( b->getBlock(hashSize) );
WORD iconSize = b->getWord();
- QByteArray icon;
+ TQByteArray icon;
icon.duplicate( b->getBlock(iconSize) );
emit haveIcon( user, icon );
}
@@ -213,7 +213,7 @@ void BuddyIconTask::sendICQBuddyIconRequest()
void BuddyIconTask::handleICQBuddyIconResponse()
{
Buffer* b = transfer()->buffer();
- QString user = b->getBUIN();
+ TQString user = b->getBUIN();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Receiving buddy icon for " << user << endl;
b->skipBytes(2); //not used
@@ -221,7 +221,7 @@ void BuddyIconTask::handleICQBuddyIconResponse()
Q_UNUSED( iconType );
BYTE hashSize = b->getByte();
- QByteArray iconHash;
+ TQByteArray iconHash;
iconHash.duplicate( b->getBlock(hashSize) );
b->skipBytes(1); //not used
@@ -230,11 +230,11 @@ void BuddyIconTask::handleICQBuddyIconResponse()
Q_UNUSED( iconType2 );
BYTE hashSize2 = b->getByte();
- QByteArray iconHash2;
+ TQByteArray iconHash2;
iconHash2.duplicate( b->getBlock(hashSize2) );
WORD iconSize = b->getWord();
- QByteArray icon;
+ TQByteArray icon;
icon.duplicate( b->getBlock(iconSize) );
emit haveIcon( user, icon );
diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h
index 83e70a53..f00a5b23 100644
--- a/kopete/protocols/oscar/liboscar/buddyicontask.h
+++ b/kopete/protocols/oscar/liboscar/buddyicontask.h
@@ -21,7 +21,7 @@
#define BUDDYICONTASK_H
#include "task.h"
-#include <qcstring.h>
+#include <tqcstring.h>
class Transfer;
@@ -31,11 +31,11 @@ Q_OBJECT
public:
BuddyIconTask( Task* parent );
- void uploadIcon( WORD length, const QByteArray& data );
+ void uploadIcon( WORD length, const TQByteArray& data );
void setReferenceNum( WORD num );
- void requestIconFor( const QString& user );
- void setHash( const QByteArray& md5Hash );
+ void requestIconFor( const TQString& user );
+ void setHash( const TQByteArray& md5Hash );
void setHashType( BYTE type );
//! Task implementation
@@ -44,7 +44,7 @@ public:
bool take( Transfer* transfer );
signals:
- void haveIcon( const QString&, QByteArray );
+ void haveIcon( const TQString&, TQByteArray );
private:
void sendIcon();
@@ -59,9 +59,9 @@ private:
Action m_action;
WORD m_iconLength;
int m_refNum;
- QByteArray m_icon;
- QString m_user;
- QByteArray m_hash;
+ TQByteArray m_icon;
+ TQString m_user;
+ TQByteArray m_hash;
BYTE m_hashType;
DWORD m_seq;
};
diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp
index b04587e7..23dca1bb 100644
--- a/kopete/protocols/oscar/liboscar/buffer.cpp
+++ b/kopete/protocols/oscar/liboscar/buffer.cpp
@@ -40,7 +40,7 @@ Buffer::Buffer(const char *b, Q_ULONG len)
mReadPos=0;
}
-Buffer::Buffer( const QByteArray& data )
+Buffer::Buffer( const TQByteArray& data )
{
mBuffer.duplicate( data );
mReadPos = 0;
@@ -110,7 +110,7 @@ int Buffer::addLEDWord(const DWORD dw)
return mBuffer.size();
}
-int Buffer::addString(QByteArray s)
+int Buffer::addString(TQByteArray s)
{
unsigned int pos = mBuffer.size();
int len = s.size();
@@ -122,7 +122,7 @@ int Buffer::addString(QByteArray s)
return mBuffer.size();
}
-int Buffer::addString(QByteArray s, DWORD len)
+int Buffer::addString(TQByteArray s, DWORD len)
{
Q_UNUSED( len );
return addString( s );
@@ -130,14 +130,14 @@ int Buffer::addString(QByteArray s, DWORD len)
int Buffer::addString( const char* s, DWORD len )
{
- QByteArray qba;
+ TQByteArray qba;
qba.duplicate( s, len );
return addString( qba );
}
int Buffer::addString(const unsigned char* s, DWORD len)
{
- QByteArray qba;
+ TQByteArray qba;
qba.duplicate( (const char*) s, len );
return addString( qba );
}
@@ -253,9 +253,9 @@ void Buffer::setBuf(char *b, const WORD len)
mReadPos = 0;
}
-QByteArray Buffer::getBlock(WORD len)
+TQByteArray Buffer::getBlock(WORD len)
{
- QByteArray ch( len );
+ TQByteArray ch( len );
for ( int i = 0; i < len; i++ )
{
ch[i] = getByte();
@@ -264,9 +264,9 @@ QByteArray Buffer::getBlock(WORD len)
return ch;
}
-QByteArray Buffer::getBBlock(WORD len)
+TQByteArray Buffer::getBBlock(WORD len)
{
- QByteArray data;
+ TQByteArray data;
data.duplicate(mBuffer.data() + mReadPos, len);
mReadPos += len;
return data;
@@ -286,9 +286,9 @@ WORD *Buffer::getWordBlock(WORD len)
}
-QCString Buffer::getLEBlock(WORD len)
+TQCString Buffer::getLEBlock(WORD len)
{
- QCString ch;
+ TQCString ch;
for (unsigned int i=0;i<len;i++)
ch += getLEByte();
@@ -340,9 +340,9 @@ TLV Buffer::getTLV()
return t;
}
-QValueList<TLV> Buffer::getTLVList()
+TQValueList<TLV> Buffer::getTLVList()
{
- QValueList<TLV> ql;
+ TQValueList<TLV> ql;
while (mReadPos < mBuffer.size())
{
@@ -363,7 +363,7 @@ QValueList<TLV> Buffer::getTLVList()
}
int Buffer::addChatTLV(const WORD type, const WORD exchange,
- const QString &roomname, const WORD instance)
+ const TQString &roomname, const WORD instance)
{
addWord(type);
addWord(0x0005 + roomname.length());
@@ -376,21 +376,21 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange,
void Buffer::expandBuffer(unsigned int inc)
{
- mBuffer.resize(mBuffer.size()+inc, QGArray::SpeedOptim);
+ mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim);
}
-QCString Buffer::getLNTS()
+TQCString Buffer::getLNTS()
{
WORD len = getLEWord();
- QCString qcs;
+ TQCString qcs;
qcs.duplicate( getBlock(len) );
return qcs;
}
-QCString Buffer::getLELNTS()
+TQCString Buffer::getLELNTS()
{
WORD len = getLEWord();
- QCString qcs;
+ TQCString qcs;
qcs.duplicate( getBlock(len) );
return qcs;
}
@@ -425,10 +425,10 @@ int Buffer::addBSTR(const char * s)
return ret;
}
-QByteArray Buffer::getBSTR()
+TQByteArray Buffer::getBSTR()
{
WORD len = getWord();
- QByteArray qba;
+ TQByteArray qba;
qba.duplicate( getBlock(len) );
return qba;
}
@@ -441,10 +441,10 @@ int Buffer::addBUIN(const char * s)
return ret;
}
-QByteArray Buffer::getBUIN()
+TQByteArray Buffer::getBUIN()
{
BYTE len = getByte();
- QByteArray qba;
+ TQByteArray qba;
qba.duplicate( getBlock(len) );
return qba;
}
@@ -459,16 +459,16 @@ int Buffer::length() const
return (mBuffer.size() - mReadPos);
}
-QString Buffer::toString() const
+TQString Buffer::toString() const
{
// line format:
//00 03 00 0b 00 00 90 b8 f5 9f 09 31 31 33 37 38 |;tJ�..........|
int i = 0;
- QString output = "\n";
- QString hex, ascii;
+ TQString output = "\n";
+ TQString hex, ascii;
- QByteArray::ConstIterator it;
+ TQByteArray::ConstIterator it;
for ( it = mBuffer.begin(); it != mBuffer.end(); ++it )
{
i++;
@@ -477,7 +477,7 @@ QString Buffer::toString() const
if ( c < 0x10 )
hex.append("0");
- hex.append(QString("%1 ").arg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
@@ -485,8 +485,8 @@ QString Buffer::toString() const
{
output += hex + " |" + ascii + "|\n";
i=0;
- hex=QString::null;
- ascii=QString::null;
+ hex=TQString::null;
+ ascii=TQString::null;
}
}
@@ -497,22 +497,22 @@ QString Buffer::toString() const
return output;
}
-QString Buffer::peekBSTR()
+TQString Buffer::peekBSTR()
{
int lastPos = mReadPos;
- QByteArray qba = getBSTR();
+ TQByteArray qba = getBSTR();
mReadPos = lastPos;
- return QString( qba );
+ return TQString( qba );
}
-QString Buffer::peekBUIN()
+TQString Buffer::peekBUIN()
{
int lastPos = mReadPos;
- QByteArray qba = getBUIN();
+ TQByteArray qba = getBUIN();
mReadPos = lastPos;
- return QString( qba );
+ return TQString( qba );
}
-Buffer::operator QByteArray() const
+Buffer::operator TQByteArray() const
{
return mBuffer;
}
diff --git a/kopete/protocols/oscar/liboscar/buffer.h b/kopete/protocols/oscar/liboscar/buffer.h
index 900ddb50..b5035b52 100644
--- a/kopete/protocols/oscar/liboscar/buffer.h
+++ b/kopete/protocols/oscar/liboscar/buffer.h
@@ -22,8 +22,8 @@
#include "oscartypes.h"
-#include <qvaluelist.h>
-#include <qcstring.h>
+#include <tqvaluelist.h>
+#include <tqcstring.h>
class QString;
@@ -50,9 +50,9 @@ class Buffer
/**
* \brief Create a prefilled buffer
*
- * Constructor that creates a prefilled buffer from the QByteArray \p data
+ * Constructor that creates a prefilled buffer from the TQByteArray \p data
*/
- Buffer( const QByteArray& data );
+ Buffer( const TQByteArray& data );
/** Default destructor */
@@ -72,8 +72,8 @@ class Buffer
/**
* adds the given string to the buffer (make sure it's NULL-terminated)
*/
- int addString(QByteArray);
- int addString(QByteArray, DWORD);
+ int addString(TQByteArray);
+ int addString(TQByteArray, DWORD);
int addString(const char*, DWORD);
int addString(const unsigned char*, DWORD);
@@ -141,9 +141,9 @@ class Buffer
int addLETLV(WORD, WORD, const char *);
/**
- * Returns a QString representation of the buffer
+ * Returns a TQString representation of the buffer
*/
- QString toString() const;
+ TQString toString() const;
/**
* gets a DWord out of the buffer
@@ -183,8 +183,8 @@ class Buffer
/**
* Allocates memory for and gets a block of buffer bytes
*/
- QByteArray getBlock(WORD len);
- QByteArray getBBlock(WORD len);
+ TQByteArray getBlock(WORD len);
+ TQByteArray getBBlock(WORD len);
/**
* Allocates memory for and gets a block of buffer words
@@ -194,14 +194,14 @@ class Buffer
/**
* Same as above but returning little-endian
*/
- QCString getLEBlock(WORD len);
+ TQCString getLEBlock(WORD len);
/**
* Convenience function that gets a LNTS (long null terminated string)
* from the buffer. Otherwise you'd need a getWord() + getBlock() call :)
*/
- QCString getLNTS();
- QCString getLELNTS();
+ TQCString getLNTS();
+ TQCString getLELNTS();
/**
* adds a 16-bit long TLV
@@ -231,25 +231,25 @@ class Buffer
/**
* Gets a list of TLV's
*/
- QValueList<TLV> getTLVList();
+ TQValueList<TLV> getTLVList();
/**
* Creates a chat data segment for a tlv and calls addTLV with that data
*/
- int addChatTLV(const WORD, const WORD, const QString &, const WORD);
+ int addChatTLV(const WORD, const WORD, const TQString &, const WORD);
/**
* Similar to the LNTS functions but string is NOT null-terminated
*/
int addBSTR(const char * s);
- QByteArray getBSTR();
- QString peekBSTR();
+ TQByteArray getBSTR();
+ TQString peekBSTR();
int addBUIN(const char * s);
- QByteArray getBUIN();
- QString peekBUIN();
+ TQByteArray getBUIN();
+ TQString peekBUIN();
- operator QByteArray() const;
+ operator TQByteArray() const;
private:
/**
@@ -258,7 +258,7 @@ class Buffer
void expandBuffer(unsigned int inc);
private:
- QByteArray mBuffer;
+ TQByteArray mBuffer;
unsigned int mReadPos;
};
diff --git a/kopete/protocols/oscar/liboscar/bytestream.cpp b/kopete/protocols/oscar/liboscar/bytestream.cpp
index 109dbbad..87603c76 100644
--- a/kopete/protocols/oscar/liboscar/bytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/bytestream.cpp
@@ -35,7 +35,7 @@
//!
//! The signals connectionClosed(), delayedCloseFinished(), readyRead(),
//! bytesWritten(), and error() serve the exact same function as those from
-//! <A HREF="http://doc.trolltech.com/3.1/qsocket.html">QSocket</A>.
+//! <A HREF="http://doc.trolltech.com/3.1/tqsocket.html">TQSocket</A>.
//!
//! The simplest way to create a ByteStream is to reimplement isOpen(), close(),
//! and tryWrite(). Call appendRead() whenever you want to make data available for
@@ -59,13 +59,13 @@ class ByteStream::Private
public:
Private() {}
- QByteArray readBuf, writeBuf;
+ TQByteArray readBuf, writeBuf;
};
//!
//! Constructs a ByteStream object with parent \a parent.
-ByteStream::ByteStream(QObject *parent)
-:QObject(parent)
+ByteStream::ByteStream(TQObject *parent)
+:TQObject(parent)
{
d = new Private;
}
@@ -95,7 +95,7 @@ void ByteStream::close()
//!
//! Writes array \a a to the stream.
-void ByteStream::write(const QByteArray &a)
+void ByteStream::write(const TQByteArray &a)
{
if(!isOpen())
return;
@@ -109,7 +109,7 @@ void ByteStream::write(const QByteArray &a)
//!
//! Reads bytes \a bytes of data from the stream and returns them as an array. If \a bytes is 0, then
//! \a read will return all available data.
-QByteArray ByteStream::read(int bytes)
+TQByteArray ByteStream::read(int bytes)
{
return takeRead(bytes);
}
@@ -130,9 +130,9 @@ int ByteStream::bytesToWrite() const
//!
//! Writes string \a cs to the stream.
-void ByteStream::write(const QCString &cs)
+void ByteStream::write(const TQCString &cs)
{
- QByteArray block(cs.length());
+ TQByteArray block(cs.length());
memcpy(block.data(), cs.data(), block.size());
write(block);
}
@@ -153,14 +153,14 @@ void ByteStream::clearWriteBuffer()
//!
//! Appends \a block to the end of the read buffer.
-void ByteStream::appendRead(const QByteArray &block)
+void ByteStream::appendRead(const TQByteArray &block)
{
appendArray(&d->readBuf, block);
}
//!
//! Appends \a block to the end of the write buffer.
-void ByteStream::appendWrite(const QByteArray &block)
+void ByteStream::appendWrite(const TQByteArray &block)
{
appendArray(&d->writeBuf, block);
}
@@ -169,7 +169,7 @@ void ByteStream::appendWrite(const QByteArray &block)
//! Returns \a size bytes from the start of the read buffer.
//! If \a size is 0, then all available data will be returned.
//! If \a del is TRUE, then the bytes are also removed.
-QByteArray ByteStream::takeRead(int size, bool del)
+TQByteArray ByteStream::takeRead(int size, bool del)
{
return takeArray(&d->readBuf, size, del);
}
@@ -178,21 +178,21 @@ QByteArray ByteStream::takeRead(int size, bool del)
//! Returns \a size bytes from the start of the write buffer.
//! If \a size is 0, then all available data will be returned.
//! If \a del is TRUE, then the bytes are also removed.
-QByteArray ByteStream::takeWrite(int size, bool del)
+TQByteArray ByteStream::takeWrite(int size, bool del)
{
return takeArray(&d->writeBuf, size, del);
}
//!
//! Returns a reference to the read buffer.
-QByteArray & ByteStream::readBuf()
+TQByteArray & ByteStream::readBuf()
{
return d->readBuf;
}
//!
//! Returns a reference to the write buffer.
-QByteArray & ByteStream::writeBuf()
+TQByteArray & ByteStream::writeBuf()
{
return d->writeBuf;
}
@@ -207,7 +207,7 @@ int ByteStream::tryWrite()
//!
//! Append array \a b to the end of the array pointed to by \a a.
-void ByteStream::appendArray(QByteArray *a, const QByteArray &b)
+void ByteStream::appendArray(TQByteArray *a, const TQByteArray &b)
{
int oldsize = a->size();
a->resize(oldsize + b.size());
@@ -218,9 +218,9 @@ void ByteStream::appendArray(QByteArray *a, const QByteArray &b)
//! Returns \a size bytes from the start of the array pointed to by \a from.
//! If \a size is 0, then all available data will be returned.
//! If \a del is TRUE, then the bytes are also removed.
-QByteArray ByteStream::takeArray(QByteArray *from, int size, bool del)
+TQByteArray ByteStream::takeArray(TQByteArray *from, int size, bool del)
{
- QByteArray a;
+ TQByteArray a;
if(size == 0) {
a = from->copy();
if(del)
diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h
index 1c2dfa15..a990a940 100644
--- a/kopete/protocols/oscar/liboscar/bytestream.h
+++ b/kopete/protocols/oscar/liboscar/bytestream.h
@@ -21,8 +21,8 @@
#ifndef CS_BYTESTREAM_H
#define CS_BYTESTREAM_H
-#include <qobject.h>
-#include <qcstring.h>
+#include <tqobject.h>
+#include <tqcstring.h>
// CS_NAMESPACE_BEGIN
@@ -32,20 +32,20 @@ class ByteStream : public QObject
Q_OBJECT
public:
enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
- ByteStream(QObject *parent=0);
+ ByteStream(TQObject *parent=0);
virtual ~ByteStream()=0;
virtual bool isOpen() const;
virtual void close();
- virtual void write(const QByteArray &);
- virtual QByteArray read(int bytes=0);
+ virtual void write(const TQByteArray &);
+ virtual TQByteArray read(int bytes=0);
virtual int bytesAvailable() const;
virtual int bytesToWrite() const;
- void write(const QCString &);
+ void write(const TQCString &);
- static void appendArray(QByteArray *a, const QByteArray &b);
- static QByteArray takeArray(QByteArray *from, int size=0, bool del=true);
+ static void appendArray(TQByteArray *a, const TQByteArray &b);
+ static TQByteArray takeArray(TQByteArray *from, int size=0, bool del=true);
signals:
void connectionClosed();
@@ -57,12 +57,12 @@ signals:
protected:
void clearReadBuffer();
void clearWriteBuffer();
- void appendRead(const QByteArray &);
- void appendWrite(const QByteArray &);
- QByteArray takeRead(int size=0, bool del=true);
- QByteArray takeWrite(int size=0, bool del=true);
- QByteArray & readBuf();
- QByteArray & writeBuf();
+ void appendRead(const TQByteArray &);
+ void appendWrite(const TQByteArray &);
+ TQByteArray takeRead(int size=0, bool del=true);
+ TQByteArray takeWrite(int size=0, bool del=true);
+ TQByteArray & readBuf();
+ TQByteArray & writeBuf();
virtual int tryWrite();
private:
diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
index 5cb44720..7c6ff26a 100644
--- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
+++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp
@@ -18,7 +18,7 @@
#include "changevisibilitytask.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
#include "buffer.h"
#include "client.h"
@@ -64,13 +64,13 @@ bool ChangeVisibilityTask::take(Transfer* transfer)
if ( forMe( transfer ) )
{
setTransfer( transfer );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return true;
}
else
{
- setError( 0, QString::null );
+ setError( 0, TQString::null );
return false;
}
}
@@ -82,7 +82,7 @@ void ChangeVisibilityTask::onGo()
if ( !item )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Didn't find a visibility item" << endl;
- setError( 0, QString::null );
+ setError( 0, TQString::null );
return;
}
@@ -90,14 +90,14 @@ void ChangeVisibilityTask::onGo()
BYTE visibleByte = m_visible ? 0x04 : 0x03;
c8tlv.addByte( visibleByte );
- QValueList<Oscar::TLV> tList;
+ TQValueList<Oscar::TLV> tList;
tList.append( TLV( 0x00CA, c8tlv.length(), c8tlv.buffer() ) );
Oscar::SSI newSSI(item);
if ( Oscar::uptateTLVs( newSSI, tList ) == false )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Visibility didn't change, don't update" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return;
}
@@ -118,8 +118,8 @@ void ChangeVisibilityTask::onGo()
b->addWord( newSSI.type() );
b->addWord( newSSI.tlvListLength() );
- QValueList<TLV>::const_iterator it2 = newSSI.tlvList().begin();
- QValueList<TLV>::const_iterator listEnd2 = newSSI.tlvList().end();
+ TQValueList<TLV>::const_iterator it2 = newSSI.tlvList().begin();
+ TQValueList<TLV>::const_iterator listEnd2 = newSSI.tlvList().end();
for( ; it2 != listEnd2; ++it2 )
b->addTLV( ( *it2 ) );
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
index f661d1f4..914de496 100644
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
@@ -45,7 +45,7 @@ ChatNavServiceTask::RequestType ChatNavServiceTask::requestType()
return m_type;
}
-QValueList<int> ChatNavServiceTask::exchangeList() const
+TQValueList<int> ChatNavServiceTask::exchangeList() const
{
return m_exchanges;
}
@@ -97,7 +97,7 @@ bool ChatNavServiceTask::take( Transfer* transfer )
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return true;
@@ -113,12 +113,12 @@ void ChatNavServiceTask::onGo()
send( t );
}
-void ChatNavServiceTask::createRoom( WORD exchange, const QString& name )
+void ChatNavServiceTask::createRoom( WORD exchange, const TQString& name )
{
//most of this comes from gaim. thanks to them for figuring it out
- QString cookie = "create"; //hardcoded, seems to be ignored by AOL
- QString lang = "en";
- QString charset = "us-ascii";
+ TQString cookie = "create"; //hardcoded, seems to be ignored by AOL
+ TQString lang = "en";
+ TQString charset = "us-ascii";
FLAP f = { 0x02, 0, 0 };
SNAC s = { 0x000D, 0x0008, 0x0000, client()->snacSequence() };
@@ -202,7 +202,7 @@ void ChatNavServiceTask::handleExchangeInfo( const TLV& t )
break;
case 0xD3:
{
- QString eName( t.data );
+ TQString eName( t.data );
kdDebug(OSCAR_RAW_DEBUG) << "exchange name: " << eName << endl;
exchangeInfo.description = eName;
break;
@@ -227,16 +227,16 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t )
kdDebug(OSCAR_RAW_DEBUG) << "Parsing room info TLV" << t.length << endl;
Buffer b(t.data);
WORD exchange = b.getWord();
- QByteArray cookie( b.getBlock( b.getByte() ) );
+ TQByteArray cookie( b.getBlock( b.getByte() ) );
WORD instance = b.getWord();
b.getByte(); //detail level, which i'm not sure we need
WORD tlvCount = b.getWord();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "e: " << exchange
<< " c: " << cookie << " i: " << instance << endl;
- QValueList<Oscar::TLV> tlvList = b.getTLVList();
- QValueList<Oscar::TLV>::iterator it, itEnd = tlvList.end();
- QString roomName;
+ TQValueList<Oscar::TLV> tlvList = b.getTLVList();
+ TQValueList<Oscar::TLV>::iterator it, itEnd = tlvList.end();
+ TQString roomName;
for ( it = tlvList.begin(); it != itEnd; ++it )
{
TLV t = ( *it );
@@ -255,7 +255,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t )
kdDebug(OSCAR_RAW_DEBUG) << "evil generated array" << endl;
break;
case 0x6A:
- roomName = QString( t.data );
+ roomName = TQString( t.data );
kdDebug(OSCAR_RAW_DEBUG) << "fully qualified name" << roomName << endl;
break;
case 0x6B:
@@ -305,7 +305,7 @@ void ChatNavServiceTask::handleCreateRoomInfo( const TLV& t )
Buffer b( t.data );
WORD exchange = b.getWord();
WORD cookieLength = b.getByte();
- QByteArray cookie( b.getBlock( cookieLength ) );
+ TQByteArray cookie( b.getBlock( cookieLength ) );
WORD instance = b.getWord();
BYTE detailLevel = b.getByte();
@@ -316,16 +316,16 @@ void ChatNavServiceTask::handleCreateRoomInfo( const TLV& t )
}
WORD numberTlvs = b.getWord();
- QValueList<Oscar::TLV> roomTLVList = b.getTLVList();
- QValueList<Oscar::TLV>::iterator itEnd = roomTLVList.end();
- for ( QValueList<Oscar::TLV>::iterator it = roomTLVList.begin();
+ TQValueList<Oscar::TLV> roomTLVList = b.getTLVList();
+ TQValueList<Oscar::TLV>::iterator itEnd = roomTLVList.end();
+ for ( TQValueList<Oscar::TLV>::iterator it = roomTLVList.begin();
it != itEnd; ++ it )
{
switch( ( *it ).type )
{
case 0x006A:
{
- QString fqcn = QString( ( *it ).data );
+ TQString fqcn = TQString( ( *it ).data );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "fqcn: " << fqcn << endl;
break;
}
@@ -342,7 +342,7 @@ void ChatNavServiceTask::handleCreateRoomInfo( const TLV& t )
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "max occupancy: " << t.data << endl;
break;
case 0x00D3:
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "name: " << QString( t.data ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "name: " << TQString( t.data ) << endl;
break;
case 0x00D5:
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "create perms: " << t.data << endl;
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
index 6b7d8764..8af63247 100644
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
@@ -19,7 +19,7 @@
#include "task.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <oscartypes.h>
class Transfer;
@@ -43,13 +43,13 @@ public:
virtual bool forMe( const Transfer* transfer ) const;
virtual bool take( Transfer* transfer );
virtual void onGo();
- void createRoom( WORD exchange, const QString& name ); //create a room. sends the packet as well
+ void createRoom( WORD exchange, const TQString& name ); //create a room. sends the packet as well
- QValueList<int> exchangeList() const;
+ TQValueList<int> exchangeList() const;
signals:
- void haveChatExchanges( const QValueList<int>& );
- void connectChat( WORD, QByteArray, WORD, const QString& );
+ void haveChatExchanges( const TQValueList<int>& );
+ void connectChat( WORD, TQByteArray, WORD, const TQString& );
private:
void handleExchangeInfo( const TLV& t );
@@ -57,7 +57,7 @@ private:
void handleCreateRoomInfo( const TLV& t );
private:
- QValueList<int> m_exchanges;
+ TQValueList<int> m_exchanges;
RequestType m_type;
};
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index 9d07afe8..c8998495 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -20,17 +20,17 @@
#include "chatservicetask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include "connection.h"
#include "transfer.h"
#include "buffer.h"
#include "oscartypes.h"
-ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const QString& room )
+ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room )
: Task( parent ), m_encoding( "us-ascii" )
{
m_exchange = exchange;
@@ -47,7 +47,7 @@ void ChatServiceTask::setMessage( const Oscar::Message& msg )
m_message = msg;
}
-void ChatServiceTask::setEncoding( const QCString& enc )
+void ChatServiceTask::setEncoding( const TQCString& enc )
{
m_encoding = enc;
}
@@ -56,7 +56,7 @@ void ChatServiceTask::onGo()
{
if ( !m_message )
{
- setSuccess( true, QString::null );
+ setSuccess( true, TQString::null );
return;
}
@@ -78,7 +78,7 @@ void ChatServiceTask::onGo()
type3.type = 0x0003;
type3.length = 0x0002;
- type3.data = QCString( "en" ); //hardcode for right now. don't know that we can do others
+ type3.data = TQCString( "en" ); //hardcode for right now. don't know that we can do others
type1.type = 0x0001;
type1.length = m_message.textArray().size();
@@ -158,7 +158,7 @@ bool ChatServiceTask::take( Transfer* t )
break;
};
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return true;
}
@@ -170,7 +170,7 @@ void ChatServiceTask::parseRoomInfo()
Buffer* b = transfer()->buffer();
m_exchange = b->getWord();
- QByteArray cookie( b->getBlock( b->getByte() ) );
+ TQByteArray cookie( b->getBlock( b->getByte() ) );
instance = b->getWord();
detailLevel = b->getByte();
@@ -179,15 +179,15 @@ void ChatServiceTask::parseRoomInfo()
//correctly anyways
b->skipBytes( 2 );
- QValueList<Oscar::TLV> tlvList = b->getTLVList();
- QValueList<Oscar::TLV>::iterator it = tlvList.begin();
- QValueList<Oscar::TLV>::iterator itEnd = tlvList.end();
+ TQValueList<Oscar::TLV> tlvList = b->getTLVList();
+ TQValueList<Oscar::TLV>::iterator it = tlvList.begin();
+ TQValueList<Oscar::TLV>::iterator itEnd = tlvList.end();
for ( ; it != itEnd; ++it )
{
switch ( ( *it ).type )
{
case 0x006A:
- m_internalRoom = QString( ( *it ).data );
+ m_internalRoom = TQString( ( *it ).data );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "room name: " << m_room << endl;
break;
case 0x006F:
@@ -221,7 +221,7 @@ void ChatServiceTask::parseJoinNotification()
Buffer* b = transfer()->buffer();
while ( b->length() > 0 )
{
- QString sender( b->getBUIN() );
+ TQString sender( b->getBUIN() );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "user name:" << sender << endl;
WORD warningLevel = b->getWord();
WORD numTLVs = b->getWord();
@@ -252,7 +252,7 @@ void ChatServiceTask::parseLeftNotification()
Buffer* b = transfer()->buffer();
while ( b->length() > 0 )
{
- QString sender( b->getBUIN() );
+ TQString sender( b->getBUIN() );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "user name:" << sender << endl;
WORD warningLevel = b->getWord();
WORD numTLVs = b->getWord();
@@ -281,12 +281,12 @@ void ChatServiceTask::parseChatMessage()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "have new chat room message" << endl;
Buffer* b = transfer()->buffer();
bool whisper = true, reflection = false;
- QByteArray language, encoding, message;
- QString sender;
- QByteArray icbmCookie( b->getBlock( 8 ) );
+ TQByteArray language, encoding, message;
+ TQString sender;
+ TQByteArray icbmCookie( b->getBlock( 8 ) );
b->skipBytes( 2 ); //message channel always 0x03
- QValueList<Oscar::TLV> chatTLVs = b->getTLVList();
- QValueList<Oscar::TLV>::iterator it, itEnd = chatTLVs.end();
+ TQValueList<Oscar::TLV> chatTLVs = b->getTLVList();
+ TQValueList<Oscar::TLV>::iterator it, itEnd = chatTLVs.end();
for ( it = chatTLVs.begin(); it != itEnd; ++it )
{
switch ( ( *it ).type )
@@ -326,7 +326,7 @@ void ChatServiceTask::parseChatMessage()
case 0x0003: //user info
{
Buffer b( ( *it ).data );
- sender = QString( b.getBUIN() );
+ sender = TQString( b.getBUIN() );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "got user info. sender is " << sender << endl;
}
break;
@@ -334,14 +334,14 @@ void ChatServiceTask::parseChatMessage()
}
}
- QTextCodec* codec = QTextCodec::codecForName( encoding );
+ TQTextCodec* codec = TQTextCodec::codecForName( encoding );
if ( ! codec )
- codec = QTextCodec::codecForMib( 4 );
- QString msgText( codec->toUnicode( message ) );
+ codec = TQTextCodec::codecForMib( 4 );
+ TQString msgText( codec->toUnicode( message ) );
Oscar::Message omessage;
omessage.setReceiver( client()->userId() );
omessage.setSender( sender );
- omessage.setTimestamp( QDateTime::currentDateTime() );
+ omessage.setTimestamp( TQDateTime::currentDateTime() );
omessage.setText( Oscar::Message::UTF8, msgText );
omessage.setType( 0x03 );
omessage.setExchange( m_exchange );
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h
index 90e29300..5f19fcae 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.h
@@ -29,7 +29,7 @@ class ChatServiceTask : public Task
{
Q_OBJECT
public:
- ChatServiceTask( Task* parent, Oscar::WORD exchange, const QString& room );
+ ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room );
~ChatServiceTask();
void onGo();
@@ -44,11 +44,11 @@ public:
void parseChatError();
void setMessage( const Oscar::Message& msg );
- void setEncoding( const QCString &enc );
+ void setEncoding( const TQCString &enc );
signals:
- void userJoinedChat( Oscar::WORD, const QString& r, const QString& u );
- void userLeftChat( Oscar::WORD, const QString& r, const QString& u );
+ void userJoinedChat( Oscar::WORD, const TQString& r, const TQString& u );
+ void userLeftChat( Oscar::WORD, const TQString& r, const TQString& u );
void newChatMessage( const Oscar::Message& msg );
protected:
@@ -56,10 +56,10 @@ protected:
private:
WORD m_exchange;
- QString m_room;
- QString m_internalRoom;
+ TQString m_room;
+ TQString m_internalRoom;
Oscar::Message m_message;
- QCString m_encoding;
+ TQCString m_encoding;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index af967512..222d9d69 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -20,8 +20,8 @@
#include "client.h"
-#include <qtimer.h>
-#include <qtextcodec.h>
+#include <tqtimer.h>
+#include <tqtextcodec.h>
#include <kdebug.h> //for kdDebug()
#include <klocale.h>
@@ -66,13 +66,13 @@ namespace
class DefaultCodecProvider : public Client::CodecProvider
{
public:
- virtual QTextCodec* codecForContact( const QString& ) const
+ virtual TQTextCodec* codecForContact( const TQString& ) const
{
- return QTextCodec::codecForMib( 4 );
+ return TQTextCodec::codecForMib( 4 );
}
- virtual QTextCodec* codecForAccount() const
+ virtual TQTextCodec* codecForAccount() const
{
- return QTextCodec::codecForMib( 4 );
+ return TQTextCodec::codecForMib( 4 );
}
};
@@ -84,7 +84,7 @@ class Client::ClientPrivate
public:
ClientPrivate() {}
- QString host, user, pass;
+ TQString host, user, pass;
uint port;
int tzoffset;
bool active;
@@ -95,11 +95,11 @@ public:
//Protocol specific data
bool isIcq;
bool redirectRequested;
- QValueList<WORD> redirectionServices;
+ TQValueList<WORD> redirectionServices;
WORD currentRedirect;
- QByteArray cookie;
+ TQByteArray cookie;
DWORD connectAsStatus; // icq only
- QString connectWithMessage; // icq only
+ TQString connectWithMessage; // icq only
Oscar::Settings* settings;
//Tasks
@@ -120,25 +120,25 @@ public:
UserDetails ourDetails;
//Infos
- QValueList<int> exchanges;
+ TQValueList<int> exchanges;
- QString statusMessage; // for away-,DND-message etc...
+ TQString statusMessage; // for away-,DND-message etc...
//away messages
struct AwayMsgRequest
{
- QString contact;
+ TQString contact;
ICQStatus contactStatus;
};
- QValueList<AwayMsgRequest> awayMsgRequestQueue;
- QTimer* awayMsgRequestTimer;
+ TQValueList<AwayMsgRequest> awayMsgRequestQueue;
+ TQTimer* awayMsgRequestTimer;
CodecProvider* codecProvider;
const Oscar::ClientVersion* version;
};
-Client::Client( QObject* parent )
-:QObject( parent, "oscarclient" )
+Client::Client( TQObject* parent )
+:TQObject( parent, "oscarclient" )
{
m_loginTask = 0L;
m_loginTaskTwo = 0L;
@@ -162,13 +162,13 @@ Client::Client( QObject* parent )
d->stage = ClientPrivate::StageOne;
d->typingNotifyTask = 0L;
d->ssiModifyTask = 0L;
- d->awayMsgRequestTimer = new QTimer();
+ d->awayMsgRequestTimer = new TQTimer();
d->codecProvider = &defaultCodecProvider;
- connect( this, SIGNAL( redirectionFinished( WORD ) ),
- this, SLOT( checkRedirectionQueue( WORD ) ) );
- connect( d->awayMsgRequestTimer, SIGNAL( timeout() ),
- this, SLOT( nextICQAwayMessageRequest() ) );
+ connect( this, TQT_SIGNAL( redirectionFinished( WORD ) ),
+ this, TQT_SLOT( checkRedirectionQueue( WORD ) ) );
+ connect( d->awayMsgRequestTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( nextICQAwayMessageRequest() ) );
}
Client::~Client()
@@ -188,20 +188,20 @@ Oscar::Settings* Client::clientSettings() const
return d->settings;
}
-void Client::connectToServer( Connection *c, const QString& server, bool auth )
+void Client::connectToServer( Connection *c, const TQString& server, bool auth )
{
d->connections.append( c );
if ( auth == true )
{
m_loginTask = new StageOneLoginTask( c->rootTask() );
- connect( m_loginTask, SIGNAL( finished() ), this, SLOT( lt_loginFinished() ) );
+ connect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) );
}
- connect( c, SIGNAL( socketError( int, const QString& ) ), this, SLOT( determineDisconnection( int, const QString& ) ) );
+ connect( c, TQT_SIGNAL( socketError( int, const TQString& ) ), this, TQT_SLOT( determineDisconnection( int, const TQString& ) ) );
c->connectToServer(server, auth);
}
-void Client::start( const QString &host, const uint port, const QString &userId, const QString &pass )
+void Client::start( const TQString &host, const uint port, const TQString &userId, const TQString &pass )
{
Q_UNUSED( host );
Q_UNUSED( port );
@@ -223,7 +223,7 @@ void Client::close()
if ( d->stage == ClientPrivate::StageTwo )
{
d->connectAsStatus = 0x0;
- d->connectWithMessage = QString::null;
+ d->connectWithMessage = TQString::null;
}
d->exchanges.clear();
@@ -233,18 +233,18 @@ void Client::close()
d->ssiManager->clear();
}
-void Client::setStatus( AIMStatus status, const QString &_message )
+void Client::setStatus( AIMStatus status, const TQString &_message )
{
// AIM: you're away exactly when your away message isn't empty.
- // can't use QString::null as a message either; ProfileTask
+ // can't use TQString::null as a message either; ProfileTask
// interprets null as "don't change".
- QString message;
+ TQString message;
if ( status == Online )
- message = QString::fromAscii("");
+ message = TQString::fromAscii("");
else
{
if ( _message.isEmpty() )
- message = QString::fromAscii(" ");
+ message = TQString::fromAscii(" ");
else
message = _message;
}
@@ -257,7 +257,7 @@ void Client::setStatus( AIMStatus status, const QString &_message )
pt->go( true );
}
-void Client::setStatus( DWORD status, const QString &message )
+void Client::setStatus( 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;
@@ -302,7 +302,7 @@ UserDetails Client::ourInfo() const
return d->ourDetails;
}
-QString Client::host()
+TQString Client::host()
{
return d->host;
}
@@ -343,7 +343,7 @@ void Client::lt_loginFinished()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl;
initializeStaticTasks();
ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() );
- connect( ssTask, SIGNAL( finished() ), this, SLOT( serviceSetupFinished() ) );
+ connect( ssTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( serviceSetupFinished() ) );
ssTask->go( true ); //fire and forget
m_loginTaskTwo->deleteLater();
m_loginTaskTwo = 0;
@@ -351,7 +351,7 @@ void Client::lt_loginFinished()
else if ( d->stage == ClientPrivate::StageOne )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage one login done" << endl;
- disconnect( m_loginTask, SIGNAL( finished() ), this, SLOT( lt_loginFinished() ) );
+ disconnect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) );
if ( m_loginTask->statusCode() == 0 ) //we can start stage two
{
@@ -362,7 +362,7 @@ void Client::lt_loginFinished()
d->port = m_loginTask->bosPort().toUInt();
d->cookie = m_loginTask->loginCookie();
close();
- QTimer::singleShot( 100, this, SLOT(startStageTwo() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT(startStageTwo() ) );
}
else
{
@@ -379,17 +379,17 @@ void Client::lt_loginFinished()
void Client::startStageTwo()
{
//create a new connection and set it up
- Connection* c = createConnection( d->host, QString::number( d->port ) );
+ Connection* c = createConnection( d->host, TQString::number( d->port ) );
new CloseConnectionTask( c->rootTask() );
//create the new login task
m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() );
m_loginTaskTwo->setCookie( d->cookie );
- QObject::connect( m_loginTaskTwo, SIGNAL( finished() ), this, SLOT( lt_loginFinished() ) );
+ TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) );
//connect
- QObject::connect( c, SIGNAL( connected() ), this, SLOT( streamConnected() ) );
+ TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) );
connectToServer( c, d->host, false ) ;
}
@@ -411,8 +411,8 @@ void Client::serviceSetupFinished()
return;
OfflineMessagesTask *offlineMsgTask = new OfflineMessagesTask( c->rootTask() );
- connect( offlineMsgTask, SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ),
- this, SIGNAL( messageReceived(const Oscar::Message& ) ) );
+ connect( offlineMsgTask, TQT_SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ),
+ this, TQT_SIGNAL( messageReceived(const Oscar::Message& ) ) );
offlineMsgTask->go( true );
}
@@ -420,7 +420,7 @@ void Client::serviceSetupFinished()
emit loggedIn();
}
-void Client::receivedIcqInfo( const QString& contact, unsigned int type )
+void Client::receivedIcqInfo( const TQString& contact, unsigned int type )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "received icq info for " << contact
<< " of type " << type << endl;
@@ -437,7 +437,7 @@ void Client::receivedInfo( Q_UINT16 sequence )
emit receivedUserInfo( details.userId(), details );
}
-void Client::offlineUser( const QString& user, const UserDetails& )
+void Client::offlineUser( const TQString& user, const UserDetails& )
{
emit userIsOffline( user );
}
@@ -462,27 +462,27 @@ void Client::setVersion( const Oscar::ClientVersion* version )
// INTERNALS //
-QString Client::userId() const
+TQString Client::userId() const
{
return d->user;
}
-QString Client::password() const
+TQString Client::password() const
{
return d->pass;
}
-QString Client::statusMessage() const
+TQString Client::statusMessage() const
{
return d->statusMessage;
}
-void Client::setStatusMessage( const QString &message )
+void Client::setStatusMessage( const TQString &message )
{
d->statusMessage = message;
}
-QCString Client::ipAddress() const
+TQCString Client::ipAddress() const
{
//!TODO determine ip address
return "127.0.0.1";
@@ -493,7 +493,7 @@ void Client::notifyTaskError( const Oscar::SNAC& s, int errCode, bool fatal )
emit taskError( s, errCode, fatal );
}
-void Client::notifySocketError( int errCode, const QString& msg )
+void Client::notifySocketError( int errCode, const TQString& msg )
{
emit socketError( errCode, msg );
}
@@ -538,13 +538,13 @@ void Client::receivedMessage( const Oscar::Message& msg )
Oscar::Message response ( msg );
if ( msg.hasProperty( Oscar::Message::StatusMessageRequest ) )
{
- QTextCodec* codec = d->codecProvider->codecForContact( msg.sender() );
+ TQTextCodec* codec = d->codecProvider->codecForContact( msg.sender() );
response.setText( Oscar::Message::UserDefined, statusMessage(), codec );
}
else
{
response.setEncoding( Oscar::Message::UserDefined );
- response.setTextArray( QByteArray() );
+ response.setTextArray( TQByteArray() );
}
response.setReceiver( msg.sender() );
response.addProperty( Oscar::Message::AutoResponse );
@@ -557,7 +557,7 @@ void Client::receivedMessage( const Oscar::Message& msg )
if ( msg.hasProperty( Oscar::Message::AutoResponse ) )
{
// we got a response to a status message request.
- QString awayMessage( msg.text( d->codecProvider->codecForContact( msg.sender() ) ) );
+ TQString awayMessage( msg.text( d->codecProvider->codecForContact( msg.sender() ) ) );
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Received an away message: " << awayMessage << endl;
emit receivedAwayMessage( msg.sender(), awayMessage );
}
@@ -574,7 +574,7 @@ void Client::receivedMessage( const Oscar::Message& msg )
}
}
-void Client::requestAuth( const QString& contactid, const QString& reason )
+void Client::requestAuth( const TQString& contactid, const TQString& reason )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -582,7 +582,7 @@ void Client::requestAuth( const QString& contactid, const QString& reason )
d->ssiAuthTask->sendAuthRequest( contactid, reason );
}
-void Client::sendAuth( const QString& contactid, const QString& reason, bool auth )
+void Client::sendAuth( const TQString& contactid, const TQString& reason, bool auth )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -605,7 +605,7 @@ void Client::setIsIcq( bool isIcq )
d->isIcq = isIcq;
}
-void Client::debug( const QString& str )
+void Client::debug( const TQString& str )
{
Q_UNUSED(str);
// qDebug( "CLIENT: %s", str.ascii() );
@@ -627,37 +627,37 @@ void Client::initializeStaticTasks()
d->typingNotifyTask = new TypingNotifyTask( c->rootTask() );
d->ssiModifyTask = new SSIModifyTask( c->rootTask(), true );
- connect( d->onlineNotifier, SIGNAL( userIsOnline( const QString&, const UserDetails& ) ),
- this, SIGNAL( receivedUserInfo( const QString&, const UserDetails& ) ) );
- connect( d->onlineNotifier, SIGNAL( userIsOffline( const QString&, const UserDetails& ) ),
- this, SLOT( offlineUser( const QString&, const UserDetails & ) ) );
+ connect( d->onlineNotifier, TQT_SIGNAL( userIsOnline( const TQString&, const UserDetails& ) ),
+ this, TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ) );
+ connect( d->onlineNotifier, TQT_SIGNAL( userIsOffline( const TQString&, const UserDetails& ) ),
+ this, TQT_SLOT( offlineUser( const TQString&, const UserDetails & ) ) );
- connect( d->ownStatusTask, SIGNAL( gotInfo() ), this, SLOT( haveOwnUserInfo() ) );
- connect( d->ownStatusTask, SIGNAL( buddyIconUploadRequested() ), this,
- SIGNAL( iconNeedsUploading() ) );
+ connect( d->ownStatusTask, TQT_SIGNAL( gotInfo() ), this, TQT_SLOT( haveOwnUserInfo() ) );
+ connect( d->ownStatusTask, TQT_SIGNAL( buddyIconUploadRequested() ), this,
+ TQT_SIGNAL( iconNeedsUploading() ) );
- connect( d->messageReceiverTask, SIGNAL( receivedMessage( const Oscar::Message& ) ),
- this, SLOT( receivedMessage( const Oscar::Message& ) ) );
+ connect( d->messageReceiverTask, TQT_SIGNAL( receivedMessage( const Oscar::Message& ) ),
+ this, TQT_SLOT( receivedMessage( const Oscar::Message& ) ) );
- connect( d->ssiAuthTask, SIGNAL( authRequested( const QString&, const QString& ) ),
- this, SIGNAL( authRequestReceived( const QString&, const QString& ) ) );
- connect( d->ssiAuthTask, SIGNAL( authReplied( const QString&, const QString&, bool ) ),
- this, SIGNAL( authReplyReceived( const QString&, const QString&, bool ) ) );
+ connect( d->ssiAuthTask, TQT_SIGNAL( authRequested( const TQString&, const TQString& ) ),
+ this, TQT_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ) );
+ connect( d->ssiAuthTask, TQT_SIGNAL( authReplied( const TQString&, const TQString&, bool ) ),
+ this, TQT_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ) );
- connect( d->icqInfoTask, SIGNAL( receivedInfoFor( const QString&, unsigned int ) ),
- this, SLOT( receivedIcqInfo( const QString&, unsigned int ) ) );
+ connect( d->icqInfoTask, TQT_SIGNAL( receivedInfoFor( const TQString&, unsigned int ) ),
+ this, TQT_SLOT( receivedIcqInfo( const TQString&, unsigned int ) ) );
- connect( d->userInfoTask, SIGNAL( receivedProfile( const QString&, const QString& ) ),
- this, SIGNAL( receivedProfile( const QString&, const QString& ) ) );
- connect( d->userInfoTask, SIGNAL( receivedAwayMessage( const QString&, const QString& ) ),
- this, SIGNAL( receivedAwayMessage( const QString&, const QString& ) ) );
- connect( d->typingNotifyTask, SIGNAL( typingStarted( const QString& ) ),
- this, SIGNAL( userStartedTyping( const QString& ) ) );
- connect( d->typingNotifyTask, SIGNAL( typingFinished( const QString& ) ),
- this, SIGNAL( userStoppedTyping( const QString& ) ) );
+ connect( d->userInfoTask, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ),
+ this, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ) );
+ connect( d->userInfoTask, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ),
+ this, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ) );
+ connect( d->typingNotifyTask, TQT_SIGNAL( typingStarted( const TQString& ) ),
+ this, TQT_SIGNAL( userStartedTyping( const TQString& ) ) );
+ connect( d->typingNotifyTask, TQT_SIGNAL( typingFinished( const TQString& ) ),
+ this, TQT_SIGNAL( userStoppedTyping( const TQString& ) ) );
}
-void Client::removeGroup( const QString& groupName )
+void Client::removeGroup( const TQString& groupName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -671,7 +671,7 @@ void Client::removeGroup( const QString& groupName )
delete ssimt;
}
-void Client::addGroup( const QString& groupName )
+void Client::addGroup( const TQString& groupName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -685,7 +685,7 @@ void Client::addGroup( const QString& groupName )
delete ssimt;
}
-void Client::addContact( const QString& contactName, const QString& groupName )
+void Client::addContact( const TQString& contactName, const TQString& groupName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -699,7 +699,7 @@ void Client::addContact( const QString& contactName, const QString& groupName )
delete ssimt;
}
-void Client::removeContact( const QString& contactName )
+void Client::removeContact( const TQString& contactName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -713,7 +713,7 @@ void Client::removeContact( const QString& contactName )
delete ssimt;
}
-void Client::renameGroup( const QString & oldGroupName, const QString & newGroupName )
+void Client::renameGroup( const TQString & oldGroupName, const TQString & newGroupName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -764,7 +764,7 @@ void Client::modifySSIItem( const Oscar::SSI& oldItem, const Oscar::SSI& newItem
}
}
-void Client::changeContactGroup( const QString& contact, const QString& newGroupName )
+void Client::changeContactGroup( const TQString& contact, const TQString& newGroupName )
{
Connection* c = d->connections.connectionForFamily( 0x0013 );
if ( !c )
@@ -779,7 +779,7 @@ void Client::changeContactGroup( const QString& contact, const QString& newGroup
delete ssimt;
}
-void Client::requestFullInfo( const QString& contactId )
+void Client::requestFullInfo( const TQString& contactId )
{
Connection* c = d->connections.connectionForFamily( 0x0015 );
if ( !c )
@@ -789,7 +789,7 @@ void Client::requestFullInfo( const QString& contactId )
d->icqInfoTask->go();
}
-void Client::requestShortInfo( const QString& contactId )
+void Client::requestShortInfo( const TQString& contactId )
{
Connection* c = d->connections.connectionForFamily( 0x0015 );
if ( !c )
@@ -799,7 +799,7 @@ void Client::requestShortInfo( const QString& contactId )
d->icqInfoTask->go();
}
-void Client::sendWarning( const QString& contact, bool anonymous )
+void Client::sendWarning( const TQString& contact, bool anonymous )
{
Connection* c = d->connections.connectionForFamily( 0x0004 );
if ( !c )
@@ -807,62 +807,62 @@ void Client::sendWarning( const QString& contact, bool anonymous )
WarningTask* warnTask = new WarningTask( c->rootTask() );
warnTask->setContact( contact );
warnTask->setAnonymous( anonymous );
- QObject::connect( warnTask, SIGNAL( userWarned( const QString&, Q_UINT16, Q_UINT16 ) ),
- this, SIGNAL( userWarned( const QString&, Q_UINT16, Q_UINT16 ) ) );
+ TQObject::connect( warnTask, TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ),
+ this, TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ) );
warnTask->go( true );
}
-ICQGeneralUserInfo Client::getGeneralInfo( const QString& contact )
+ICQGeneralUserInfo Client::getGeneralInfo( const TQString& contact )
{
return d->icqInfoTask->generalInfoFor( contact );
}
-ICQWorkUserInfo Client::getWorkInfo( const QString& contact )
+ICQWorkUserInfo Client::getWorkInfo( const TQString& contact )
{
return d->icqInfoTask->workInfoFor( contact );
}
-ICQEmailInfo Client::getEmailInfo( const QString& contact )
+ICQEmailInfo Client::getEmailInfo( const TQString& contact )
{
return d->icqInfoTask->emailInfoFor( contact );
}
-ICQMoreUserInfo Client::getMoreInfo( const QString& contact )
+ICQMoreUserInfo Client::getMoreInfo( const TQString& contact )
{
return d->icqInfoTask->moreInfoFor( contact );
}
-ICQInterestInfo Client::getInterestInfo( const QString& contact )
+ICQInterestInfo Client::getInterestInfo( const TQString& contact )
{
return d->icqInfoTask->interestInfoFor( contact );
}
-ICQShortInfo Client::getShortInfo( const QString& contact )
+ICQShortInfo Client::getShortInfo( const TQString& contact )
{
return d->icqInfoTask->shortInfoFor( contact );
}
-QValueList<int> Client::chatExchangeList() const
+TQValueList<int> Client::chatExchangeList() const
{
return d->exchanges;
}
-void Client::setChatExchangeList( const QValueList<int>& exchanges )
+void Client::setChatExchangeList( const TQValueList<int>& exchanges )
{
d->exchanges = exchanges;
}
-void Client::requestAIMProfile( const QString& contact )
+void Client::requestAIMProfile( const TQString& contact )
{
d->userInfoTask->requestInfoFor( contact, UserInfoTask::Profile );
}
-void Client::requestAIMAwayMessage( const QString& contact )
+void Client::requestAIMAwayMessage( const TQString& contact )
{
d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage );
}
-void Client::requestICQAwayMessage( const QString& contact, ICQStatus contactStatus )
+void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl;
Oscar::Message msg;
@@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const QString& contact, ICQStatus contactSta
sendMessage( msg );
}
-void Client::addICQAwayMessageRequest( const QString& contact, ICQStatus contactStatus )
+void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for "
<< contact << " to queue" << endl;
@@ -909,12 +909,12 @@ void Client::addICQAwayMessageRequest( const QString& contact, ICQStatus contact
d->awayMsgRequestTimer->start( 1000 );
}
-void Client::removeICQAwayMessageRequest( const QString& contact )
+void Client::removeICQAwayMessageRequest( const TQString& contact )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "removing away message request for "
<< contact << " from queue" << endl;
- QValueList<ClientPrivate::AwayMsgRequest>::iterator it = d->awayMsgRequestQueue.begin();
+ TQValueList<ClientPrivate::AwayMsgRequest>::iterator it = d->awayMsgRequestQueue.begin();
while ( it != d->awayMsgRequestQueue.end() )
{
if ( (*it).contact == contact )
@@ -962,7 +962,7 @@ void Client::nextICQAwayMessageRequest()
requestICQAwayMessage( amr.contact, amr.contactStatus );
}
-void Client::requestStatusInfo( const QString& contact )
+void Client::requestStatusInfo( const TQString& contact )
{
d->userInfoTask->requestInfoFor( contact, UserInfoTask::General );
}
@@ -973,27 +973,27 @@ void Client::whitePagesSearch( const ICQWPSearchInfo& info )
if ( !c )
return;
UserSearchTask* ust = new UserSearchTask( c->rootTask() );
- connect( ust, SIGNAL( foundUser( const ICQSearchResult& ) ),
- this, SIGNAL( gotSearchResults( const ICQSearchResult& ) ) );
- connect( ust, SIGNAL( searchFinished( int ) ), this, SIGNAL( endOfSearch( int ) ) );
+ connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ),
+ this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) );
+ connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) );
ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works
ust->searchWhitePages( info );
}
-void Client::uinSearch( const QString& uin )
+void Client::uinSearch( const TQString& uin )
{
Connection* c = d->connections.connectionForFamily( 0x0015 );
if ( !c )
return;
UserSearchTask* ust = new UserSearchTask( c->rootTask() );
- connect( ust, SIGNAL( foundUser( const ICQSearchResult& ) ),
- this, SIGNAL( gotSearchResults( const ICQSearchResult& ) ) );
- connect( ust, SIGNAL( searchFinished( int ) ), this, SIGNAL( endOfSearch( int ) ) );
+ connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ),
+ this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) );
+ connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) );
ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works
ust->searchUserByUIN( uin );
}
-void Client::updateProfile( const QString& profile )
+void Client::updateProfile( const TQString& profile )
{
Connection* c = d->connections.connectionForFamily( 0x0002 );
if ( !c )
@@ -1003,7 +1003,7 @@ void Client::updateProfile( const QString& profile )
pt->go(true);
}
-void Client::sendTyping( const QString & contact, bool typing )
+void Client::sendTyping( const TQString & contact, bool typing )
{
Connection* c = d->connections.connectionForFamily( 0x0004 );
if ( !c )
@@ -1022,7 +1022,7 @@ void Client::connectToIconServer()
return;
}
-void Client::setIgnore( const QString& user, bool ignore )
+void Client::setIgnore( const TQString& user, bool ignore )
{
Oscar::SSI item = ssiManager()->findItem( user, ROSTER_IGNORE );
if ( item && !ignore )
@@ -1033,12 +1033,12 @@ void Client::setIgnore( const QString& user, bool ignore )
else if ( !item && ignore )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding " << user << " to ignore list" << endl;
- Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_IGNORE, QValueList<TLV>() );
+ Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_IGNORE, TQValueList<TLV>() );
this->modifySSIItem( Oscar::SSI(), s );
}
}
-void Client::setVisibleTo( const QString& user, bool visible )
+void Client::setVisibleTo( const TQString& user, bool visible )
{
Oscar::SSI item = ssiManager()->findItem( user, ROSTER_VISIBLE );
if ( item && !visible )
@@ -1049,12 +1049,12 @@ void Client::setVisibleTo( const QString& user, bool visible )
else if ( !item && visible )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding " << user << " to visible list" << endl;
- Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_VISIBLE, QValueList<TLV>() );
+ Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_VISIBLE, TQValueList<TLV>() );
this->modifySSIItem( Oscar::SSI(), s );
}
}
-void Client::setInvisibleTo( const QString& user, bool invisible )
+void Client::setInvisibleTo( const TQString& user, bool invisible )
{
Oscar::SSI item = ssiManager()->findItem( user, ROSTER_INVISIBLE );
if ( item && !invisible )
@@ -1065,20 +1065,20 @@ void Client::setInvisibleTo( const QString& user, bool invisible )
else if ( !item && invisible )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding " << user << " to invisible list" << endl;
- Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_INVISIBLE, QValueList<TLV>() );
+ Oscar::SSI s( user, 0, ssiManager()->nextContactId(), ROSTER_INVISIBLE, TQValueList<TLV>() );
this->modifySSIItem( Oscar::SSI(), s );
}
}
-void Client::requestBuddyIcon( const QString& user, const QByteArray& hash, BYTE hashType )
+void Client::requestBuddyIcon( const TQString& user, const TQByteArray& hash, BYTE hashType )
{
Connection* c = d->connections.connectionForFamily( 0x0010 );
if ( !c )
return;
BuddyIconTask* bit = new BuddyIconTask( c->rootTask() );
- connect( bit, SIGNAL( haveIcon( const QString&, QByteArray ) ),
- this, SIGNAL( haveIconForContact( const QString&, QByteArray ) ) );
+ connect( bit, TQT_SIGNAL( haveIcon( const TQString&, TQByteArray ) ),
+ this, TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ) );
bit->requestIconFor( user );
bit->setHashType( hashType );
bit->setHash( hash );
@@ -1086,8 +1086,8 @@ void Client::requestBuddyIcon( const QString& user, const QByteArray& hash, BYTE
}
void Client::requestServerRedirect( WORD family, WORD exchange,
- QByteArray cookie, WORD instance,
- const QString& room )
+ TQByteArray cookie, WORD instance,
+ const TQString& room )
{
//making the assumption that family 2 will always be the BOS connection
//use it instead since we can't query for family 1
@@ -1116,21 +1116,21 @@ void Client::requestServerRedirect( WORD family, WORD exchange,
srt->setChatRoom( room );
}
- connect( srt, SIGNAL( haveServer( const QString&, const QByteArray&, WORD ) ),
- this, SLOT( haveServerForRedirect( const QString&, const QByteArray&, WORD ) ) );
+ connect( srt, TQT_SIGNAL( haveServer( const TQString&, const TQByteArray&, WORD ) ),
+ this, TQT_SLOT( haveServerForRedirect( const TQString&, const TQByteArray&, WORD ) ) );
srt->setService( family );
srt->go( true );
}
-void Client::haveServerForRedirect( const QString& host, const QByteArray& cookie, WORD )
+void Client::haveServerForRedirect( const TQString& host, const TQByteArray& cookie, WORD )
{
//nasty sender() usage to get the task with chat room info
- QObject* o = const_cast<QObject*>( sender() );
+ TQObject* o = const_cast<TQObject*>( sender() );
ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( o );
//create a new connection and set it up
int colonPos = host.find(':');
- QString realHost, realPort;
+ TQString realHost, realPort;
if ( colonPos != -1 )
{
realHost = host.left( colonPos );
@@ -1139,18 +1139,18 @@ void Client::haveServerForRedirect( const QString& host, const QByteArray& cooki
else
{
realHost = host;
- realPort = QString::fromLatin1("5190");
+ realPort = TQString::fromLatin1("5190");
}
Connection* c = createConnection( realHost, realPort );
//create the new login task
m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() );
m_loginTaskTwo->setCookie( cookie );
- QObject::connect( m_loginTaskTwo, SIGNAL( finished() ), this, SLOT( serverRedirectFinished() ) );
+ TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverRedirectFinished() ) );
//connect
connectToServer( c, d->host, false );
- QObject::connect( c, SIGNAL( connected() ), this, SLOT( streamConnected() ) );
+ TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) );
if ( srt )
d->connections.addChatInfoForConnection( c, srt->chatExchange(), srt->chatRoomName() );
@@ -1176,8 +1176,8 @@ void Client::serverRedirectFinished()
if ( d->currentRedirect == 0x000D )
{
- connect( this, SIGNAL( chatNavigationConnected() ),
- this, SLOT( requestChatNavLimits() ) );
+ connect( this, TQT_SIGNAL( chatNavigationConnected() ),
+ this, TQT_SLOT( requestChatNavLimits() ) );
emit chatNavigationConnected();
}
@@ -1192,18 +1192,18 @@ void Client::serverRedirectFinished()
}
Connection* c = m_loginTaskTwo->client();
- QString roomName = d->connections.chatRoomForConnection( c );
+ TQString roomName = d->connections.chatRoomForConnection( c );
WORD exchange = d->connections.exchangeForConnection( c );
if ( c )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting up chat connection" << endl;
ChatServiceTask* cst = new ChatServiceTask( c->rootTask(), exchange, roomName );
- connect( cst, SIGNAL( userJoinedChat( Oscar::WORD, const QString&, const QString& ) ),
- this, SIGNAL( userJoinedChat( Oscar::WORD, const QString&, const QString& ) ) );
- connect( cst, SIGNAL( userLeftChat( Oscar::WORD, const QString&, const QString& ) ),
- this, SIGNAL( userLeftChat( Oscar::WORD, const QString&, const QString& ) ) );
- connect( cst, SIGNAL( newChatMessage( const Oscar::Message& ) ),
- this, SIGNAL( messageReceived( const Oscar::Message& ) ) );
+ connect( cst, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ),
+ this, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) );
+ connect( cst, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ),
+ this, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) );
+ connect( cst, TQT_SIGNAL( newChatMessage( const Oscar::Message& ) ),
+ this, TQT_SIGNAL( messageReceived( const Oscar::Message& ) ) );
}
emit chatRoomConnected( exchange, roomName );
}
@@ -1234,19 +1234,19 @@ void Client::requestChatNavLimits()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting chat nav service limits" << endl;
ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() );
cnst->setRequestType( ChatNavServiceTask::Limits );
- QObject::connect( cnst, SIGNAL( haveChatExchanges( const QValueList<int>& ) ),
- this, SLOT( setChatExchangeList( const QValueList<int>& ) ) );
+ TQObject::connect( cnst, TQT_SIGNAL( haveChatExchanges( const TQValueList<int>& ) ),
+ this, TQT_SLOT( setChatExchangeList( const TQValueList<int>& ) ) );
cnst->go( true ); //autodelete
}
-void Client::determineDisconnection( int code, const QString& string )
+void Client::determineDisconnection( int code, const TQString& string )
{
if ( !sender() )
return;
//yay for the sender() hack!
- QObject* obj = const_cast<QObject*>( sender() );
+ TQObject* obj = const_cast<TQObject*>( sender() );
Connection* c = dynamic_cast<Connection*>( obj );
if ( !c )
return;
@@ -1262,7 +1262,7 @@ void Client::determineDisconnection( int code, const QString& string )
c = 0;
}
-void Client::sendBuddyIcon( const QByteArray& iconData )
+void Client::sendBuddyIcon( const TQByteArray& iconData )
{
Connection* c = d->connections.connectionForFamily( 0x0010 );
if ( !c )
@@ -1274,7 +1274,7 @@ void Client::sendBuddyIcon( const QByteArray& iconData )
bit->go( true );
}
-void Client::joinChatRoom( const QString& roomName, int exchange )
+void Client::joinChatRoom( const TQString& roomName, int exchange )
{
Connection* c = d->connections.connectionForFamily( 0x000D );
if ( !c )
@@ -1283,21 +1283,21 @@ void Client::joinChatRoom( const QString& roomName, int exchange )
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "joining the chat room '" << roomName
<< "' on exchange " << exchange << endl;
ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() );
- connect( cnst, SIGNAL( connectChat( WORD, QByteArray, WORD, const QString& ) ),
- this, SLOT( setupChatConnection( WORD, QByteArray, WORD, const QString& ) ) );
+ connect( cnst, TQT_SIGNAL( connectChat( WORD, TQByteArray, WORD, const TQString& ) ),
+ this, TQT_SLOT( setupChatConnection( WORD, TQByteArray, WORD, const TQString& ) ) );
cnst->createRoom( exchange, roomName );
}
-void Client::setupChatConnection( WORD exchange, QByteArray cookie, WORD instance, const QString& room )
+void Client::setupChatConnection( WORD exchange, TQByteArray cookie, WORD instance, const TQString& room )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "cookie is:" << cookie << endl;
- QByteArray realCookie( cookie );
+ TQByteArray realCookie( cookie );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "connection to chat room" << endl;
requestServerRedirect( 0x000E, exchange, realCookie, instance, room );
}
-void Client::disconnectChatRoom( WORD exchange, const QString& room )
+void Client::disconnectChatRoom( WORD exchange, const TQString& room )
{
Connection* c = d->connections.connectionForChatRoom( exchange, room );
if ( !c )
@@ -1308,7 +1308,7 @@ void Client::disconnectChatRoom( WORD exchange, const QString& room )
}
-Connection* Client::createConnection( const QString& host, const QString& port )
+Connection* Client::createConnection( const TQString& host, const TQString& port )
{
KNetworkConnector* knc = new KNetworkConnector( 0 );
knc->setOptHostPort( host, port.toUInt() );
diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h
index f5dc531e..5c619c33 100644
--- a/kopete/protocols/oscar/liboscar/client.h
+++ b/kopete/protocols/oscar/liboscar/client.h
@@ -23,8 +23,8 @@
#ifndef LIBOSCAR_CLIENT_H
#define LIBOSCAR_CLIENT_H
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
#include "kopete_export.h"
#include "rtf2html.h"
#include "transfer.h"
@@ -56,8 +56,8 @@ public:
class CodecProvider {
public:
virtual ~CodecProvider() {}
- virtual QTextCodec* codecForContact( const QString& contactName ) const = 0;
- virtual QTextCodec* codecForAccount() const = 0;
+ virtual TQTextCodec* codecForContact( const TQString& contactName ) const = 0;
+ virtual TQTextCodec* codecForAccount() const = 0;
};
enum ErrorCodes {
@@ -74,7 +74,7 @@ public:
EXTERNAL API
*************/
- Client(QObject *parent=0);
+ Client(TQObject *parent=0);
~Client();
/**
@@ -89,7 +89,7 @@ public:
* @param server the server to connect to - but this is also set on the connector used to construct the clientstream??
* @param auth indicate whether we're connecting to the authorizer or the bos server
*/
- void connectToServer( Connection *c, const QString& server, bool auth = true );
+ void connectToServer( Connection *c, const TQString& server, bool auth = true );
/**
* Start the login process for Oscar
@@ -97,14 +97,14 @@ public:
* @param user The user name to log in as.
* @param pass The password to use when logging in
*/
- void start( const QString &host, const uint port, const QString &userId, const QString &pass );
+ void start( const TQString &host, const uint port, const TQString &userId, const TQString &pass );
/** Logout and disconnect */
void close();
/** Set our status for AIM */
- void setStatus( AIMStatus status, const QString &message = QString::null );
+ void setStatus( AIMStatus status, const TQString &message = TQString::null );
/** Set our status for ICQ */
- void setStatus( DWORD status, const QString &message = QString::null );
+ void setStatus( DWORD status, const TQString &message = TQString::null );
/** Retrieve our user info */
UserDetails ourInfo() const;
@@ -114,35 +114,35 @@ public:
* \param groupName the name of the group to remove
* \return true if the group removal was successful
*/
- void removeGroup( const QString& groupName );
+ void removeGroup( const TQString& groupName );
/**
* Add a group from the contact list
* \param groupName the name of the group to add
* \return true if the group addition was successful
*/
- void addGroup( const QString& groupName );
+ void addGroup( const TQString& groupName );
/**
* Add a contact to the contact list
* \param contactName the screen name of the new contact to add
* \return true if the contact addition was successful
*/
- void addContact( const QString& contactName, const QString& groupName );
+ void addContact( const TQString& contactName, const TQString& groupName );
/**
* Remove a contact from the contact list
* \param contactName the screen name of the contact to remove
* \return true if the contact removal was successful
*/
- void removeContact( const QString &contactName );
+ void removeContact( const TQString &contactName );
/**
* Rename a group on the contact list
* \param oldGroupName the old group name
* \param newGroupName the new group name
*/
- void renameGroup( const QString& oldGroupName, const QString& newGroupName );
+ void renameGroup( const TQString& oldGroupName, const TQString& newGroupName );
/**
* Modify an SSI item on the SSI list
@@ -155,7 +155,7 @@ public:
* \param contact the contact to change
* \param newGroup the new group to move the contact to
*/
- void changeContactGroup( const QString& contact, const QString& newGroupName );
+ void changeContactGroup( const TQString& contact, const TQString& newGroupName );
/**
* Send a message to a contact
@@ -169,7 +169,7 @@ public:
* \param contactid the id of the contact to request auth from
* \param reason the reason for this authorization request
*/
- void requestAuth( const QString& contactid, const QString& reason );
+ void requestAuth( const TQString& contactid, const TQString& reason );
/**
* Grant or decline authorization to a contact
@@ -177,128 +177,128 @@ public:
* \param reason the reason to grant/decline authorization
* \param auth grant or decline authorization
*/
- void sendAuth( const QString& contactid, const QString& reason, bool auth=true );
+ void sendAuth( const TQString& contactid, const TQString& reason, bool auth=true );
/**
* Request full user info from an ICQ contact
* \param contactId the UIN of the contact to get info for
*/
- void requestFullInfo( const QString& contactId );
+ void requestFullInfo( const TQString& contactId );
/**
* Request short info for an ICQ contact
* \param contactId the UIN of the contact to get info for
*/
- void requestShortInfo( const QString& contactId );
+ void requestShortInfo( const TQString& contactId );
/**
* Send a warning to the OSCAR servers about a contact
* \param contact the contact to send the warning to
* \param anon indicate whether to do it anonymously
*/
- void sendWarning( const QString& contact, bool anonymous );
+ void sendWarning( const TQString& contact, bool anonymous );
/**
* Get the general ICQ info for a client
* \param contact the contact to get info for
*/
- ICQGeneralUserInfo getGeneralInfo( const QString& contact );
+ ICQGeneralUserInfo getGeneralInfo( const TQString& contact );
/**
* Get the work info for a contact
* \param contact the contact to get info for
*/
- ICQWorkUserInfo getWorkInfo( const QString& contact );
+ ICQWorkUserInfo getWorkInfo( const TQString& contact );
/**
* Get the email info for a contact
* \param contact the contact to get info for
*/
- ICQEmailInfo getEmailInfo( const QString& contact );
+ ICQEmailInfo getEmailInfo( const TQString& contact );
/**
* Get the additional info available for a contact
* \param contact the contact to get info for
*/
- ICQMoreUserInfo getMoreInfo( const QString& contact );
+ ICQMoreUserInfo getMoreInfo( const TQString& contact );
/**
* Get the interest info available for a contact
* \param contact the contact to get info for
*/
- ICQInterestInfo getInterestInfo( const QString& contact );
+ ICQInterestInfo getInterestInfo( const TQString& contact );
/**
* Get the short info available for an icq contact
* \param contact the contact to get info for
*/
- ICQShortInfo getShortInfo( const QString& contact );
+ ICQShortInfo getShortInfo( const TQString& contact );
/**
* Get the list of chat room exchanges we have
*/
- QValueList<int> chatExchangeList() const;
+ TQValueList<int> chatExchangeList() const;
/**
* Request the aim profile
* \param contact the contact to get info for
*/
- void requestAIMProfile( const QString& contact );
+ void requestAIMProfile( const TQString& contact );
/**
* Request the aim away message
* \param contact the contact to get info for
*/
- void requestAIMAwayMessage( const QString& contact );
+ void requestAIMAwayMessage( const TQString& contact );
/**
* Add the icq away message request to queue
* \param contact the contact to get info for
*/
- void addICQAwayMessageRequest( const QString& contact, ICQStatus contactStatus );
+ void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus );
/**
* Remove the icq away message request from queue
* \param contact the contact to get info for
*/
- void removeICQAwayMessageRequest( const QString& contact );
+ void removeICQAwayMessageRequest( const TQString& contact );
/** Request the extended status info */
- void requestStatusInfo( const QString& contact );
+ void requestStatusInfo( const TQString& contact );
//! Run a whitepages search
void whitePagesSearch( const ICQWPSearchInfo& info );
//! Run a UIN search
- void uinSearch( const QString& uin );
+ void uinSearch( const TQString& uin );
//! Update the user's AIM profile
- void updateProfile( const QString& profile );
+ void updateProfile( const TQString& profile );
//! Get buddy icon information for a person
- void requestBuddyIcon( const QString& user, const QByteArray& hash, BYTE hashType );
+ void requestBuddyIcon( const TQString& user, const TQByteArray& hash, BYTE hashType );
//! Start a server redirect for a different service
- void requestServerRedirect( WORD family, WORD e = 0, QByteArray c = QByteArray(),
- WORD instance = 0, const QString& room = QString::null );
+ void requestServerRedirect( WORD family, WORD e = 0, TQByteArray c = TQByteArray(),
+ WORD instance = 0, const TQString& room = TQString::null );
//! Start uploading a buddy icon
- void sendBuddyIcon( const QByteArray& imageData );
+ void sendBuddyIcon( const TQByteArray& imageData );
- void joinChatRoom( const QString& roomName, int exchange );
+ void joinChatRoom( const TQString& roomName, int exchange );
- void setIgnore( const QString& user, bool ignore );
+ void setIgnore( const TQString& user, bool ignore );
- void setVisibleTo( const QString& user, bool visible );
+ void setVisibleTo( const TQString& user, bool visible );
- void setInvisibleTo( const QString& user, bool invisible );
+ void setInvisibleTo( const TQString& user, bool invisible );
/** Accessors needed for login */
- QString host();
+ TQString host();
int port();
/** Send a typing notification */
- void sendTyping( const QString & contact, bool typing );
+ void sendTyping( const TQString & contact, bool typing );
/** Make a connection to the icon server */
void connectToIconServer();
@@ -306,7 +306,7 @@ public:
bool hasIconConnection() const;
/** We've finished chatting in a chat room, disconnect from it */
- void disconnectChatRoom( WORD exchange, const QString& room );
+ void disconnectChatRoom( WORD exchange, const TQString& room );
/** Set codec provider */
void setCodecProvider( CodecProvider* codecProvider );
@@ -320,7 +320,7 @@ public:
/**
* Print a debug statement
*/
- void debug( const QString &str );
+ void debug( const TQString &str );
/** Have we logged in yet? */
bool isActive() const;
@@ -332,29 +332,29 @@ public:
const Oscar::ClientVersion* version() const;
/** The current user's user ID */
- QString userId() const;
+ TQString userId() const;
/** The current user's password */
- QString password() const;
+ TQString password() const;
/** The current status message (a.k.a. away message) */
- QString statusMessage() const;
+ TQString statusMessage() const;
/** Change the current status message w/o changing status */
- void setStatusMessage( const QString &message );
+ void setStatusMessage( const TQString &message );
/** ICQ Settings */
bool isIcq() const;
void setIsIcq( bool isIcq );
/** Host's IP address */
- QCString ipAddress() const;
+ TQCString ipAddress() const;
/** Notify that a task error was received */
void notifyTaskError( const Oscar::SNAC& s, int errCode, bool fatal );
/** Notify that a socket error has occured */
- void notifySocketError( int errCode, const QString& msg );
+ void notifySocketError( int errCode, const TQString& msg );
signals:
/** CONNECTION EVENTS */
@@ -378,19 +378,19 @@ signals:
void haveSSIList();
/** a user is online. */
- void userIsOnline( const QString& );
+ void userIsOnline( const TQString& );
/** a user is offline. */
- void userIsOffline( const QString& );
+ void userIsOffline( const TQString& );
/** we've received a message */
void messageReceived( const Oscar::Message& );
/** we've received an authorization request */
- void authRequestReceived( const QString& contact, const QString& reason );
+ void authRequestReceived( const TQString& contact, const TQString& reason );
/** we've received an authorization reply */
- void authReplyReceived( const QString& contact, const QString& reason, bool auth );
+ void authReplyReceived( const TQString& contact, const TQString& reason, bool auth );
/**
* we've received an error from a task and need to notify somebody
@@ -400,37 +400,37 @@ signals:
/**
* we've received a socket error and need to notify somebody
*/
- void socketError( int errCode, const QString& msg );
+ void socketError( int errCode, const TQString& msg );
- void receivedIcqShortInfo( const QString& contact );
- void receivedIcqLongInfo( const QString& contact );
+ void receivedIcqShortInfo( const TQString& contact );
+ void receivedIcqLongInfo( const TQString& contact );
- void receivedProfile( const QString& contact, const QString& profile );
- void receivedAwayMessage( const QString& contact, const QString& message );
+ void receivedProfile( const TQString& contact, const TQString& profile );
+ void receivedAwayMessage( const TQString& contact, const TQString& message );
void receivedAwayMessage( const Oscar::Message& message );
- void receivedUserInfo( const QString& contact, const UserDetails& details );
+ void receivedUserInfo( const TQString& contact, const UserDetails& details );
/** We warned a user */
- void userWarned( const QString& contact, Q_UINT16 increase, Q_UINT16 newLevel );
+ void userWarned( const TQString& contact, Q_UINT16 increase, Q_UINT16 newLevel );
/** Search signals */
void gotSearchResults( const ICQSearchResult& );
void endOfSearch( int);
/* Typing signals */
- void userStartedTyping( const QString& contact );
- void userStoppedTyping( const QString& contact );
+ void userStartedTyping( const TQString& contact );
+ void userStoppedTyping( const TQString& contact );
/* Buddy icons */
- void haveIconForContact( const QString&, QByteArray iconData );
+ void haveIconForContact( const TQString&, TQByteArray iconData );
void iconServerConnected();
void iconNeedsUploading();
/* Chat rooms */
void chatNavigationConnected();
- void chatRoomConnected( WORD, const QString& );
- void userJoinedChat( Oscar::WORD, const QString& room, const QString& contact );
- void userLeftChat( Oscar::WORD, const QString& room, const QString& contact );
+ void chatRoomConnected( WORD, const TQString& );
+ void userJoinedChat( Oscar::WORD, const TQString& room, const TQString& contact );
+ void userLeftChat( Oscar::WORD, const TQString& room, const TQString& contact );
/* service redirection */
void redirectionFinished( WORD );
@@ -459,7 +459,7 @@ protected slots:
void serviceSetupFinished();
/** we have icq info for a contact */
- void receivedIcqInfo( const QString& contact, unsigned int type );
+ void receivedIcqInfo( const TQString& contact, unsigned int type );
/** we have normal user info for a contact */
void receivedInfo( Q_UINT16 sequence );
@@ -467,9 +467,9 @@ protected slots:
/** received a message of some kind */
void receivedMessage( const Oscar::Message& msg );
- void offlineUser( const QString&, const UserDetails& );
+ void offlineUser( const TQString&, const UserDetails& );
- void haveServerForRedirect( const QString& host, const QByteArray& cookie, WORD family );
+ void haveServerForRedirect( const TQString& host, const TQByteArray& cookie, WORD family );
void serverRedirectFinished();
void checkRedirectionQueue( WORD );
@@ -477,15 +477,15 @@ protected slots:
/**
* Set the list of chat room exchanges we have
*/
- void setChatExchangeList( const QValueList<int>& exchanges );
+ void setChatExchangeList( const TQValueList<int>& exchanges );
/**
* set up the connection to a chat room
*/
- void setupChatConnection( WORD, QByteArray, WORD, const QString& );
+ void setupChatConnection( WORD, TQByteArray, WORD, const TQString& );
- void determineDisconnection( int, const QString& );
+ void determineDisconnection( int, const TQString& );
void nextICQAwayMessageRequest();
@@ -497,14 +497,14 @@ private:
/** Delete the static tasks */
void deleteStaticTasks();
- Connection* createConnection( const QString& host, const QString& port );
+ Connection* createConnection( const TQString& host, const TQString& port );
/**
* Request the icq away message
* \param contact the contact to get info for
*/
//TODO only made a default for testing w/o frontend
- void requestICQAwayMessage( const QString& contact, ICQStatus contactStatus = ICQAway );
+ void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway );
private:
class ClientPrivate;
diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.cpp b/kopete/protocols/oscar/liboscar/clientreadytask.cpp
index 3338f7b3..d5b65069 100644
--- a/kopete/protocols/oscar/liboscar/clientreadytask.cpp
+++ b/kopete/protocols/oscar/liboscar/clientreadytask.cpp
@@ -38,7 +38,7 @@ ClientReadyTask::~ClientReadyTask()
{
}
-void ClientReadyTask::setFamilies( const QValueList<int>& families )
+void ClientReadyTask::setFamilies( const TQValueList<int>& families )
{
m_familyList = families;
}
@@ -52,8 +52,8 @@ void ClientReadyTask::onGo()
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Sending client ready, end of login" << endl;
//nasty nasty nasty hack to get all the packets to work
- QValueList<int>::const_iterator rcEnd = m_familyList.constEnd();
- for ( QValueList<int>::const_iterator it = m_familyList.constBegin(); it != rcEnd; ++it )
+ TQValueList<int>::const_iterator rcEnd = m_familyList.constEnd();
+ for ( TQValueList<int>::const_iterator it = m_familyList.constBegin(); it != rcEnd; ++it )
{
//I have no idea what any of these values mean. I just copied them from oscarsocket
int i = ( *it );
@@ -102,7 +102,7 @@ void ClientReadyTask::onGo()
//with the hell that is oscar login. (just wait until you get a message)
Transfer* t = createTransfer( f, s, buffer );
send( t );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.h b/kopete/protocols/oscar/liboscar/clientreadytask.h
index 4a9ea941..d632351f 100644
--- a/kopete/protocols/oscar/liboscar/clientreadytask.h
+++ b/kopete/protocols/oscar/liboscar/clientreadytask.h
@@ -20,7 +20,7 @@
#include "task.h"
#include "rateclass.h"
-#include "qvaluelist.h"
+#include "tqvaluelist.h"
/**
Fire and forget task to let the server know we're ready
@@ -34,11 +34,11 @@ public:
~ClientReadyTask();
virtual void onGo();
- void setFamilies( const QValueList<int>& families );
+ void setFamilies( const TQValueList<int>& families );
private:
- QValueList<RateClass*> m_classList;
- QValueList<int> m_familyList;
+ TQValueList<RateClass*> m_classList;
+ TQValueList<int> m_familyList;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
index 54926949..3b062b2a 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
@@ -18,8 +18,8 @@
#include "closeconnectiontask.h"
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
#include <klocale.h>
#include "connection.h"
@@ -38,24 +38,24 @@ CloseConnectionTask::~CloseConnectionTask()
{
}
-const QByteArray& CloseConnectionTask::cookie() const
+const TQByteArray& CloseConnectionTask::cookie() const
{
return m_cookie;
}
-const QString& CloseConnectionTask::bosHost() const
+const TQString& CloseConnectionTask::bosHost() const
{
return m_bosHost;
}
-const QString& CloseConnectionTask::bosPort() const
+const TQString& CloseConnectionTask::bosPort() const
{
return m_bosPort;
}
bool CloseConnectionTask::take( Transfer* transfer )
{
- QString errorReason;
+ TQString errorReason;
WORD errorNum = 0;
if ( forMe( transfer ) )
{
@@ -70,12 +70,12 @@ bool CloseConnectionTask::take( Transfer* transfer )
return false;
}
- QValueList<TLV> tlvList = ft->buffer()->getTLVList();
+ TQValueList<TLV> tlvList = ft->buffer()->getTLVList();
TLV uin = findTLV( tlvList, 0x0001 );
if ( uin )
{
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(1) [UIN], uin=" << QString( uin.data ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(1) [UIN], uin=" << TQString( uin.data ) << endl;
}
TLV err = findTLV( tlvList, 0x0008 );
@@ -96,8 +96,8 @@ bool CloseConnectionTask::take( Transfer* transfer )
TLV server = findTLV( tlvList, 0x0005 );
if ( server )
{
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << QString( server.data ) << endl;
- QString ip = server.data;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << TQString( server.data ) << endl;
+ TQString ip = server.data;
int index = ip.find( ':' );
m_bosHost = ip.left( index );
ip.remove( 0 , index+1 ); //get rid of the colon and everything before it
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h
index b241b07e..35c2ed18 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h
@@ -20,7 +20,7 @@
#define CLOSECONNECTIONTASK_H
#include <task.h>
-#include <qcstring.h>
+#include <tqcstring.h>
class Transfer;
class QString;
@@ -38,21 +38,21 @@ public:
virtual bool take(Transfer* transfer);
//Protocol specific stuff
- const QByteArray& cookie() const;
- const QString& bosHost() const;
- const QString& bosPort() const;
+ const TQByteArray& cookie() const;
+ const TQString& bosHost() const;
+ const TQString& bosPort() const;
protected:
virtual bool forMe(const Transfer* transfer) const;
private:
- bool parseDisconnectCode( int error, QString& reason );
+ bool parseDisconnectCode( int error, TQString& reason );
private:
- QByteArray m_cookie;
- QString m_bosHost;
- QString m_bosPort;
+ TQByteArray m_cookie;
+ TQString m_bosHost;
+ TQString m_bosPort;
};
diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp
index c7cbc0fe..a4bc4877 100644
--- a/kopete/protocols/oscar/liboscar/connection.cpp
+++ b/kopete/protocols/oscar/liboscar/connection.cpp
@@ -38,7 +38,7 @@ public:
DWORD snacSequence;
WORD flapSequence;
- QValueList<int> familyList;
+ TQValueList<int> familyList;
RateClassManager* rateClassManager;
ClientStream* clientStream;
@@ -51,7 +51,7 @@ public:
Connection::Connection( Connector* connector, ClientStream* cs, const char* name )
-: QObject( 0, name )
+: TQObject( 0, name )
{
d = new ConnectionPrivate();
d->clientStream = cs;
@@ -77,14 +77,14 @@ Connection::~Connection()
void Connection::setClient( Client* c )
{
d->client = c;
- connect( c, SIGNAL( loggedIn() ), this, SLOT( loggedIn() ) );
+ connect( c, TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loggedIn() ) );
}
-void Connection::connectToServer( const QString& host, bool auth )
+void Connection::connectToServer( const TQString& host, bool auth )
{
- connect( d->clientStream, SIGNAL( error( int ) ), this, SLOT( streamSocketError( int ) ) );
- connect( d->clientStream, SIGNAL( readyRead() ), this, SLOT( streamReadyRead() ) );
- connect( d->clientStream, SIGNAL( connected() ), this, SIGNAL( connected() ) );
+ connect( d->clientStream, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( streamSocketError( int ) ) );
+ connect( d->clientStream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) );
+ connect( d->clientStream, TQT_SIGNAL( connected() ), this, TQT_SIGNAL( connected() ) );
d->clientStream->connectToServer( host, auth );
}
@@ -99,12 +99,12 @@ bool Connection::isSupported( int family ) const
return ( d->familyList.findIndex( family ) != -1 );
}
-QValueList<int> Connection::supportedFamilies() const
+TQValueList<int> Connection::supportedFamilies() const
{
return d->familyList;
}
-void Connection::addToSupportedFamilies( const QValueList<int>& familyList )
+void Connection::addToSupportedFamilies( const TQValueList<int>& familyList )
{
d->familyList += familyList;
}
@@ -144,12 +144,12 @@ Q_UINT32 Connection::snacSequence()
return d->snacSequence;
}
-QString Connection::userId() const
+TQString Connection::userId() const
{
return d->client->userId();
}
-QString Connection::password() const
+TQString Connection::password() const
{
return d->client->password();
}
diff --git a/kopete/protocols/oscar/liboscar/connection.h b/kopete/protocols/oscar/liboscar/connection.h
index 4170857e..f2c1da75 100644
--- a/kopete/protocols/oscar/liboscar/connection.h
+++ b/kopete/protocols/oscar/liboscar/connection.h
@@ -18,8 +18,8 @@ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel@kde.org>
#ifndef CONNECTION_H
#define CONNECTION_H
-#include <qobject.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
#include "oscartypes.h"
#include "rateclass.h"
@@ -55,7 +55,7 @@ public:
void setClient( Client* );
- void connectToServer( const QString& server, bool auth = true );
+ void connectToServer( const TQString& server, bool auth = true );
/**
* Close the connection and reset the connection data
*/
@@ -72,14 +72,14 @@ public:
* Get the list of supported families
* @return The list of families supported on this connection
*/
- QValueList<int> supportedFamilies() const;
+ TQValueList<int> supportedFamilies() const;
/**
* Add the SNAC families in \p familyList to the list of supported families for
* this connection
* \param familyList the list of families to add
*/
- void addToSupportedFamilies( const QValueList<int>& familyList );
+ void addToSupportedFamilies( const TQValueList<int>& familyList );
/**
* Add the SNAC family in \p family to the list of supported families for
@@ -94,7 +94,7 @@ public:
* need to be filtered on
* \param rateClassList the list of rate classes to add
*/
- void addToRateClasses( const QValueList<RateClass*> rateClassList );
+ void addToRateClasses( const TQValueList<RateClass*> rateClassList );
/**
* Add the rate class in \p rc to the list of rate classes packets
@@ -125,7 +125,7 @@ public:
/**
* Get the chat room name for this connection.
- * @return the name of the room or QString::null if not connected to a room
+ * @return the name of the room or TQString::null if not connected to a room
*/
/** Get the user settings object */
@@ -138,10 +138,10 @@ public:
Q_UINT32 snacSequence();
/** Get the cookie for this connection */
- QByteArray cookie() const;
+ TQByteArray cookie() const;
- QString userId() const;
- QString password() const;
+ TQString userId() const;
+ TQString password() const;
bool isIcq() const;
SSIManager* ssiManager() const;
const Oscar::ClientVersion* version() const;
@@ -176,7 +176,7 @@ signals:
* \param errCode the error code from the operating system
* \param errString the i18n'ed string that describes the error
*/
- void socketError( int errCode, const QString& errString );
+ void socketError( int errCode, const TQString& errString );
private:
diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
index bf5706ee..bd4df3c5 100644
--- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp
+++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp
@@ -17,7 +17,7 @@
*/
#include "connectionhandler.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
#include "connection.h"
#include "oscartypes.h"
@@ -25,8 +25,8 @@
class ConnectionHandler::Private
{
public:
- QValueList<Connection*> connections;
- QMap<Connection*, ConnectionRoomInfo> chatRoomConnections;
+ TQValueList<Connection*> connections;
+ TQMap<Connection*, ConnectionRoomInfo> chatRoomConnections;
};
ConnectionHandler::ConnectionHandler()
@@ -57,8 +57,8 @@ void ConnectionHandler::remove( int family )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Removing all connections " <<
"supporting family " << family << endl;
- QValueList<Connection*>::iterator it = d->connections.begin();
- QValueList<Connection*>::iterator itEnd = d->connections.end();
+ TQValueList<Connection*>::iterator it = d->connections.begin();
+ TQValueList<Connection*>::iterator itEnd = d->connections.end();
for ( ; it != itEnd; ++it )
{
if ( ( *it )->isSupported( family ) )
@@ -84,8 +84,8 @@ void ConnectionHandler::clear()
Connection* ConnectionHandler::connectionForFamily( int family ) const
{
- QValueList<Connection*>::iterator it = d->connections.begin();
- QValueList<Connection*>::iterator itEnd = d->connections.end();
+ TQValueList<Connection*>::iterator it = d->connections.begin();
+ TQValueList<Connection*>::iterator itEnd = d->connections.end();
int connectionCount = 0;
Connection* lastConnection = 0;
for ( ; it != itEnd; ++it )
@@ -110,7 +110,7 @@ Connection* ConnectionHandler::defaultConnection() const
return d->connections.first();
}
-void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const QString& room )
+void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room )
{
if ( d->connections.findIndex( c ) == -1 )
d->connections.append( c );
@@ -119,10 +119,10 @@ void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exc
d->chatRoomConnections[c] = info;
}
-Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const QString& room )
+Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room )
{
ConnectionRoomInfo infoToFind = qMakePair( exchange, room );
- QMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
+ TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{
if ( it.data() == infoToFind )
@@ -135,22 +135,22 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons
return 0;
}
-QString ConnectionHandler::chatRoomForConnection( Connection* c )
+TQString ConnectionHandler::chatRoomForConnection( Connection* c )
{
if ( d->connections.findIndex( c ) == -1 )
- return QString::null;
+ return TQString::null;
- QMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
+ TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{
if ( it.key() == c )
{
- QString room = it.data().second;
+ TQString room = it.data().second;
return room;
}
}
- return QString::null;
+ return TQString::null;
}
Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c )
@@ -159,7 +159,7 @@ Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c )
if ( d->connections.findIndex( c ) == -1 )
return 0xFFFF;
- QMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
+ TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end();
for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it )
{
if ( it.key() == c )
diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.h b/kopete/protocols/oscar/liboscar/connectionhandler.h
index 6094cab3..e8c50b12 100644
--- a/kopete/protocols/oscar/liboscar/connectionhandler.h
+++ b/kopete/protocols/oscar/liboscar/connectionhandler.h
@@ -20,13 +20,13 @@
#define CONNECTIONHANDLER_H
#include "oscartypes.h"
-#include <qstring.h>
-#include <qpair.h>
+#include <tqstring.h>
+#include <tqpair.h>
class Connection;
-typedef QPair<Oscar::WORD, QString> ConnectionRoomInfo;
+typedef QPair<Oscar::WORD, TQString> ConnectionRoomInfo;
/**
@author Kopete Developers
@@ -84,7 +84,7 @@ public:
* @param exchange the exchange the chat room is in
* @param room the name of the chat room
*/
- void addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const QString& room );
+ void addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room );
/**
* Get the connection for a particular room name and exchange number.
@@ -92,15 +92,15 @@ public:
* @param room the name of the chat room to find a connection for
* @return a Connection for the chat room or 0L if no connection for that room
*/
- Connection* connectionForChatRoom( Oscar::WORD exchange, const QString& room );
+ Connection* connectionForChatRoom( Oscar::WORD exchange, const TQString& room );
/**
* Get the room name for the chat room based the connection
* @return The name of the chat room that this connection is connected to
* If the connection passed in by @p c is not a chat room connection then
- * QString::null is returned.
+ * TQString::null is returned.
*/
- QString chatRoomForConnection( Connection* c );
+ TQString chatRoomForConnection( Connection* c );
/**
* Get the exchange number for the chat room based on the connection
diff --git a/kopete/protocols/oscar/liboscar/connector.cpp b/kopete/protocols/oscar/liboscar/connector.cpp
index 03a61882..c754e2d3 100644
--- a/kopete/protocols/oscar/liboscar/connector.cpp
+++ b/kopete/protocols/oscar/liboscar/connector.cpp
@@ -20,8 +20,8 @@
#include "connector.h"
-Connector::Connector(QObject *parent)
-:QObject(parent)
+Connector::Connector(TQObject *parent)
+:TQObject(parent)
{
setPeerAddressNone();
}
@@ -35,7 +35,7 @@ bool Connector::havePeerAddress() const
return haveaddr;
}
-QHostAddress Connector::peerAddress() const
+TQHostAddress Connector::peerAddress() const
{
return addr;
}
@@ -48,11 +48,11 @@ Q_UINT16 Connector::peerPort() const
void Connector::setPeerAddressNone()
{
haveaddr = false;
- addr = QHostAddress();
+ addr = TQHostAddress();
port = 0;
}
-void Connector::setPeerAddress(const QHostAddress &_addr, Q_UINT16 _port)
+void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port)
{
haveaddr = true;
addr = _addr;
diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h
index fd673163..3844ba49 100644
--- a/kopete/protocols/oscar/liboscar/connector.h
+++ b/kopete/protocols/oscar/liboscar/connector.h
@@ -22,8 +22,8 @@
#define LIBOSCAR_CONNECTOR_H
-#include <qobject.h>
-#include "qhostaddress.h"
+#include <tqobject.h>
+#include "tqhostaddress.h"
class ByteStream;
@@ -31,15 +31,15 @@ class Connector : public QObject
{
Q_OBJECT
public:
- Connector(QObject *parent=0);
+ Connector(TQObject *parent=0);
virtual ~Connector();
- virtual void connectToServer(const QString &server)=0;
+ virtual void connectToServer(const TQString &server)=0;
virtual ByteStream *stream() const=0;
virtual void done()=0;
bool havePeerAddress() const;
- QHostAddress peerAddress() const;
+ TQHostAddress peerAddress() const;
Q_UINT16 peerPort() const;
signals:
@@ -48,11 +48,11 @@ signals:
protected:
void setPeerAddressNone();
- void setPeerAddress(const QHostAddress &addr, Q_UINT16 port);
+ void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port);
private:
bool haveaddr;
- QHostAddress addr;
+ TQHostAddress addr;
Q_UINT16 port;
};
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
index 4f114039..918b3751 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
@@ -24,9 +24,9 @@
#include "coreprotocol.h"
-#include <qdatastream.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
+#include <tqdatastream.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <ctype.h>
@@ -36,16 +36,16 @@
#include "flapprotocol.h"
#include "snacprotocol.h"
-static QString toString( const QByteArray& buffer )
+static TQString toString( const TQByteArray& buffer )
{
// line format:
//00 03 00 0b 00 00 90 b8 f5 9f 09 31 31 33 37 38 |;tJ�..........|
int i = 0;
- QString output = "\n";
- QString hex, ascii;
+ TQString output = "\n";
+ TQString hex, ascii;
- QByteArray::ConstIterator it;
+ TQByteArray::ConstIterator it;
for ( it = buffer.begin(); it != buffer.end(); ++it )
{
i++;
@@ -54,7 +54,7 @@ static QString toString( const QByteArray& buffer )
if ( c < 0x10 )
hex.append("0");
- hex.append(QString("%1 ").arg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
@@ -62,8 +62,8 @@ static QString toString( const QByteArray& buffer )
{
output += hex + " |" + ascii + "|\n";
i=0;
- hex=QString::null;
- ascii=QString::null;
+ hex=TQString::null;
+ ascii=TQString::null;
}
}
@@ -77,7 +77,7 @@ static QString toString( const QByteArray& buffer )
using namespace Oscar;
-CoreProtocol::CoreProtocol() : QObject()
+CoreProtocol::CoreProtocol() : TQObject()
{
m_snacProtocol = new SnacProtocol( this, "snacprotocol" );
m_flapProtocol = new FlapProtocol( this, "flapprotocol" );
@@ -92,7 +92,7 @@ int CoreProtocol::state()
return m_state;
}
-void CoreProtocol::addIncomingData( const QByteArray & incomingBytes )
+void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Received " << incomingBytes.count() << " bytes. " << endl;
// store locally
@@ -114,7 +114,7 @@ void CoreProtocol::addIncomingData( const QByteArray & incomingBytes )
{
//kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "more data in chunk!" << endl;
// copy the unparsed bytes into a new qbytearray and replace m_in with that
- QByteArray remainder( size - parsedBytes );
+ TQByteArray remainder( size - parsedBytes );
memcpy( remainder.data(), m_in.data() + parsedBytes, remainder.size() );
m_in = remainder;
}
@@ -149,7 +149,7 @@ Transfer* CoreProtocol::incomingTransfer()
}
}
-void cp_dump( const QByteArray &bytes )
+void cp_dump( const TQByteArray &bytes )
{
#ifdef OSCAR_COREPROTOCOL_DEBUG
kdDebug(OSCAR_RAW_DEBUG) << "contains: " << bytes.count() << " bytes" << endl;
@@ -174,7 +174,7 @@ void CoreProtocol::outgoingTransfer( Transfer* outgoing )
return;
}
-int CoreProtocol::wireToTransfer( const QByteArray& wire )
+int CoreProtocol::wireToTransfer( const TQByteArray& wire )
{
// processing incoming data and reassembling it into transfers
// may be an event or a response
@@ -194,13 +194,13 @@ int CoreProtocol::wireToTransfer( const QByteArray& wire )
return bytesParsed;
}
- QDataStream din( wire, IO_ReadOnly );
+ TQDataStream din( wire, IO_ReadOnly );
// look at first four bytes and decide what to do with the chunk
if ( okToProceed( din ) )
{
din >> flapStart;
- QByteArray packet;
+ TQByteArray packet;
packet.duplicate( wire );
if ( flapStart == 0x2A )
{
@@ -264,12 +264,12 @@ void CoreProtocol::reset()
m_in.resize( 0 );
}
-void CoreProtocol::slotOutgoingData( const QCString &out )
+void CoreProtocol::slotOutgoingData( const TQCString &out )
{
kdDebug(OSCAR_RAW_DEBUG) << out.data() << endl;
}
-bool CoreProtocol::okToProceed( const QDataStream &din )
+bool CoreProtocol::okToProceed( const TQDataStream &din )
{
if ( din.atEnd() )
{
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.h b/kopete/protocols/oscar/liboscar/coreprotocol.h
index f49396af..bbc9b693 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.h
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.h
@@ -21,9 +21,9 @@
#ifndef GW_CORE_PROTOCOL_H
#define GW_CORE_PROTOCOL_H
-#include <qcstring.h>
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqcstring.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
class FlapProtocol;
class SnacProtocol;
@@ -49,7 +49,7 @@ public:
* This requires parsing out each FLAP, etc. from the incoming data
* @param incomingBytes Raw data in wire format.
*/
- void addIncomingData( const QByteArray& incomingBytes );
+ void addIncomingData( const TQByteArray& incomingBytes );
/**
* @return the incoming transfer or 0 if none is available.
@@ -71,7 +71,7 @@ signals:
/**
* Emitted as the core protocol converts fields to wire ready data
*/
- void outgoingData( const QByteArray& );
+ void outgoingData( const TQByteArray& );
/**
* Emitted when there is incoming data, parsed into a Transfer
@@ -81,21 +81,21 @@ protected slots:
/**
* Just a debug method to test emitting to the socket, atm - should go to the ClientStream
*/
- void slotOutgoingData( const QCString & );
+ void slotOutgoingData( const TQCString & );
protected:
/**
* Check that there is data to read, and set the protocol's state if there isn't any.
*/
- bool okToProceed( const QDataStream &din );
+ bool okToProceed( const TQDataStream &din );
/**
* Convert incoming wire data into a Transfer object and queue it
* @return number of bytes from the input that were parsed into a Transfer
*/
- int wireToTransfer( const QByteArray& wire );
+ int wireToTransfer( const TQByteArray& wire );
private:
- QByteArray m_in; // buffer containing unprocessed bytes we received
+ TQByteArray m_in; // buffer containing unprocessed bytes we received
int m_error;
Transfer* m_inTransfer; // the transfer that is being received
int m_state; // represents the protocol's overall state
diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.cpp b/kopete/protocols/oscar/liboscar/flapprotocol.cpp
index c5dc04ed..f5e9fa03 100644
--- a/kopete/protocols/oscar/liboscar/flapprotocol.cpp
+++ b/kopete/protocols/oscar/liboscar/flapprotocol.cpp
@@ -19,16 +19,16 @@
#include "flapprotocol.h"
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <qobject.h>
+#include <tqcstring.h>
+#include <tqdatastream.h>
+#include <tqobject.h>
#include <kdebug.h>
#include "transfer.h"
using namespace Oscar;
-FlapProtocol::FlapProtocol(QObject *parent, const char *name)
+FlapProtocol::FlapProtocol(TQObject *parent, const char *name)
: InputProtocolBase(parent, name)
{
}
@@ -37,9 +37,9 @@ FlapProtocol::~FlapProtocol()
{
}
-Transfer* FlapProtocol::parse( const QByteArray & packet, uint& bytes )
+Transfer* FlapProtocol::parse( const TQByteArray & packet, uint& bytes )
{
- QDataStream* m_din = new QDataStream( packet, IO_ReadOnly );
+ TQDataStream* m_din = new TQDataStream( packet, IO_ReadOnly );
BYTE b;
WORD w;
diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h
index d61cf6c4..3d6de53b 100644
--- a/kopete/protocols/oscar/liboscar/flapprotocol.h
+++ b/kopete/protocols/oscar/liboscar/flapprotocol.h
@@ -29,7 +29,7 @@ class FlapProtocol : public InputProtocolBase
{
Q_OBJECT
public:
- FlapProtocol( QObject *parent = 0, const char *name = 0 );
+ FlapProtocol( TQObject *parent = 0, const char *name = 0 );
~FlapProtocol();
/**
@@ -39,7 +39,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an FlapTransfer object if successfull, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const TQByteArray &, uint & bytes );
};
diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp
index 960d4ee5..5b00a8fd 100644
--- a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp
+++ b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp
@@ -137,7 +137,7 @@ void ICBMParamsTask::sendMessageParams( int channel )
Transfer* st = createTransfer( f, s, buffer );
send( st );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
//kate: tab-width 4; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.cpp b/kopete/protocols/oscar/liboscar/icqlogintask.cpp
index c9f5cd52..76feaf42 100644
--- a/kopete/protocols/oscar/liboscar/icqlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/icqlogintask.cpp
@@ -18,7 +18,7 @@
#include "icqlogintask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "transfer.h"
#include "connection.h"
@@ -54,7 +54,7 @@ void IcqLoginTask::onGo()
DWORD flapVersion = 0x00000001;
Buffer *outbuf = new Buffer();
- QString encodedPassword = encodePassword( client()->password() );
+ TQString encodedPassword = encodePassword( client()->password() );
const Oscar::ClientVersion* version = client()->version();
outbuf->addDWord( flapVersion );
@@ -78,14 +78,14 @@ void IcqLoginTask::onGo()
}
-QString IcqLoginTask::encodePassword( const QString& loginPassword )
+TQString IcqLoginTask::encodePassword( const TQString& loginPassword )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Called." << endl;
// TODO: check if latin1 is the right conversion
const char *password = loginPassword.latin1();
unsigned int i = 0;
- QString encodedPassword = QString::null;
+ TQString encodedPassword = TQString::null;
//encoding table used in ICQ password XOR transformation
unsigned char encoding_table[] =
diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h
index 45fb3eb6..3bce47f1 100644
--- a/kopete/protocols/oscar/liboscar/icqlogintask.h
+++ b/kopete/protocols/oscar/liboscar/icqlogintask.h
@@ -40,7 +40,7 @@ protected:
bool forMe( Transfer* transfer ) const;
private:
- QString encodePassword( const QString& pw );
+ TQString encodePassword( const TQString& pw );
};
diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp
index a383922f..bb58a9c4 100644
--- a/kopete/protocols/oscar/liboscar/icqtask.cpp
+++ b/kopete/protocols/oscar/liboscar/icqtask.cpp
@@ -20,7 +20,7 @@
#include "buffer.h"
#include "connection.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
@@ -69,8 +69,8 @@ void ICQTask::parseInitialData( Buffer buf )
m_requestSubType = 0xFFFF;
/*kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "uin: " << m_icquin << " sequence: " << sequence
- <<" request type: 0x" << QString::number( m_requestType, 16 )
- << " request sub type: 0x" << QString::number( m_requestSubType, 16 ) << endl;*/
+ <<" request type: 0x" << TQString::number( m_requestType, 16 )
+ << " request sub type: 0x" << TQString::number( m_requestSubType, 16 ) << endl;*/
}
Buffer* ICQTask::addInitialData( Buffer* buf ) const
@@ -89,8 +89,8 @@ Buffer* ICQTask::addInitialData( Buffer* buf ) const
tlvData->addLEWord( m_requestSubType );
/*kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "uin: " << m_icquin << " sequence: " << sequence
- <<" request type: 0x" << QString::number( m_requestType, 16 )
- << " request sub type: 0x" << QString::number( m_requestSubType, 16 ) << endl; */
+ <<" request type: 0x" << TQString::number( m_requestType, 16 )
+ << " request sub type: 0x" << TQString::number( m_requestSubType, 16 ) << endl; */
if ( buf != 0 )
tlvData->addString( buf->buffer(), buf->length() );
diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.cpp b/kopete/protocols/oscar/liboscar/icquserinfo.cpp
index f853c045..bc37d313 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfo.cpp
+++ b/kopete/protocols/oscar/liboscar/icquserinfo.cpp
@@ -132,9 +132,9 @@ void ICQMoreUserInfo::fill( Buffer* buffer )
// set birthday to NULL if at least one of the values in the buffer is 0
if ( year == 0 || month == 0 || day == 0 )
- birthday = QDate();
+ birthday = TQDate();
else
- birthday = QDate( year, month, day );
+ birthday = TQDate( year, month, day );
lang1 = buffer->getByte();
lang2 = buffer->getByte();
@@ -158,7 +158,7 @@ void ICQEmailInfo::fill( Buffer* buffer )
if ( buffer->getByte() == 0x0A )
{
int numEmails = buffer->getByte();
- QString email;
+ TQString email;
for ( int i = 0; i < numEmails; i++ )
{
if ( buffer->getByte() == 0x00 )
@@ -183,7 +183,7 @@ void ICQInterestInfo::fill( Buffer* buffer )
for ( int i = 0; i < len; i++ )
{
int t=buffer->getLEWord();
- QCString d = buffer->getLELNTS();
+ TQCString d = buffer->getLELNTS();
if (t>0) { //there is some topic
if (count<4) { //i think this could not happen, i have never seen more
topics[count]=t;
@@ -213,22 +213,22 @@ void ICQSearchResult::fill( Buffer* buffer )
WORD datalength = buffer->getLEWord(); // data length
WORD len = 0;
uin = buffer->getLEDWord();
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Found UIN " << QString::number( uin ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Found UIN " << TQString::number( uin ) << endl;
len = buffer->getLEWord();
if ( len > 0 )
- nickName = QCString( buffer->getBlock( len ) );
+ nickName = TQCString( buffer->getBlock( len ) );
len = buffer->getLEWord();
if ( len > 0 )
- firstName = QCString( buffer->getBlock( len ) );
+ firstName = TQCString( buffer->getBlock( len ) );
len = buffer->getLEWord();
if ( len > 0 )
- lastName = QCString( buffer->getBlock( len ) );
+ lastName = TQCString( buffer->getBlock( len ) );
len = buffer->getLEWord();
if ( len > 0 )
- email = QCString( buffer->getBlock( len ) );
+ email = TQCString( buffer->getBlock( len ) );
auth = ( buffer->getByte() != 0x01 );
online = ( buffer->getLEWord() == 0x0001 );
diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.h b/kopete/protocols/oscar/liboscar/icquserinfo.h
index ac054721..3c3510f4 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfo.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfo.h
@@ -19,9 +19,9 @@
#ifndef _ICQUSERINFO_H_
#define _ICQUSERINFO_H_
-#include <qcstring.h>
-#include <qvaluelist.h>
-#include <qdatetime.h>
+#include <tqcstring.h>
+#include <tqvaluelist.h>
+#include <tqdatetime.h>
#include "kopete_export.h"
class Buffer;
@@ -56,10 +56,10 @@ public:
public:
unsigned long uin;
- QCString nickname;
- QCString firstName;
- QCString lastName;
- QCString email;
+ TQCString nickname;
+ TQCString firstName;
+ TQCString lastName;
+ TQCString email;
bool needsAuth;
unsigned int gender; // 0=offline, 1=online, 2=not webaware
};
@@ -73,17 +73,17 @@ public:
public:
unsigned long uin;
- QCString nickname;
- QCString firstName;
- QCString lastName;
- QCString email;
- QCString city;
- QCString state;
- QCString phoneNumber;
- QCString faxNumber;
- QCString address;
- QCString cellNumber;
- QCString zip;
+ TQCString nickname;
+ TQCString firstName;
+ TQCString lastName;
+ TQCString email;
+ TQCString city;
+ TQCString state;
+ TQCString phoneNumber;
+ TQCString faxNumber;
+ TQCString address;
+ TQCString cellNumber;
+ TQCString zip;
int country;
char timezone;
bool publishEmail;
@@ -99,18 +99,18 @@ public:
void fill( Buffer* buffer );
public:
- QCString city;
- QCString state;
- QCString phone;
- QCString fax;
- QCString address;
- QCString zip;
+ TQCString city;
+ TQCString state;
+ TQCString phone;
+ TQCString fax;
+ TQCString address;
+ TQCString zip;
int country;
- QCString company;
- QCString department;
- QCString position;
+ TQCString company;
+ TQCString department;
+ TQCString position;
int occupation;
- QCString homepage;
+ TQCString homepage;
};
class KOPETE_EXPORT ICQMoreUserInfo : public ICQInfoBase
@@ -123,13 +123,13 @@ public:
public:
int age;
unsigned int gender;
- QCString homepage;
- QDate birthday;
+ TQCString homepage;
+ TQDate birthday;
unsigned int lang1;
unsigned int lang2;
unsigned int lang3;
- QCString ocity;
- QCString ostate;
+ TQCString ocity;
+ TQCString ostate;
int ocountry;
int marital;
};
@@ -142,7 +142,7 @@ public:
void fill( Buffer* buffer );
public:
- QValueList<QCString> emailList;
+ TQValueList<TQCString> emailList;
};
class KOPETE_EXPORT ICQInterestInfo : public ICQInfoBase
@@ -155,7 +155,7 @@ public:
public:
int count;
int topics[4];
- QCString descriptions[4];
+ TQCString descriptions[4];
};
@@ -165,10 +165,10 @@ public:
ICQSearchResult();
void fill( Buffer* buffer );
Q_UINT32 uin;
- QCString firstName;
- QCString lastName;
- QCString nickName;
- QCString email;
+ TQCString firstName;
+ TQCString lastName;
+ TQCString nickName;
+ TQCString email;
bool auth;
bool online;
char gender;
@@ -180,19 +180,19 @@ class KOPETE_EXPORT ICQWPSearchInfo
public:
ICQWPSearchInfo();
- QCString firstName;
- QCString lastName;
- QCString nickName;
- QCString email;
+ TQCString firstName;
+ TQCString lastName;
+ TQCString nickName;
+ TQCString email;
int age;
int gender;
int language;
- QCString city;
- QCString state;
+ TQCString city;
+ TQCString state;
int country;
- QCString company;
- QCString department;
- QCString position;
+ TQCString company;
+ TQCString department;
+ TQCString position;
int occupation;
bool onlineOnly;
};
@@ -202,11 +202,11 @@ class ICQInfoItem
{
public:
int category;
- QCString description;
+ TQCString description;
};
-typedef QValueList<ICQInfoItem> ICQInfoItemList;
+typedef TQValueList<ICQInfoItem> ICQInfoItemList;
*/
#endif
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
index 068ac273..3635bc71 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp
@@ -89,7 +89,7 @@ bool ICQUserInfoRequestTask::take( Transfer* transfer )
buffer->skipBytes( 8 );
WORD seq = buffer->getLEWord(); // request sequence number
buffer->getLEWord(); // request data sub type
- QString contactId = m_contactSequenceMap[seq];
+ TQString contactId = m_contactSequenceMap[seq];
switch ( requestSubType() )
{
@@ -186,43 +186,43 @@ void ICQUserInfoRequestTask::onGo()
send( t );
}
-ICQGeneralUserInfo ICQUserInfoRequestTask::generalInfoFor( const QString& contact )
+ICQGeneralUserInfo ICQUserInfoRequestTask::generalInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_genInfoMap[seq];
}
-ICQWorkUserInfo ICQUserInfoRequestTask::workInfoFor( const QString& contact )
+ICQWorkUserInfo ICQUserInfoRequestTask::workInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_workInfoMap[seq];
}
-ICQMoreUserInfo ICQUserInfoRequestTask::moreInfoFor( const QString& contact )
+ICQMoreUserInfo ICQUserInfoRequestTask::moreInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_moreInfoMap[seq];
}
-ICQEmailInfo ICQUserInfoRequestTask::emailInfoFor(const QString& contact )
+ICQEmailInfo ICQUserInfoRequestTask::emailInfoFor(const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_emailInfoMap[seq];
}
-ICQShortInfo ICQUserInfoRequestTask::shortInfoFor( const QString& contact )
+ICQShortInfo ICQUserInfoRequestTask::shortInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_shortInfoMap[seq];
}
-ICQInterestInfo ICQUserInfoRequestTask::interestInfoFor( const QString& contact )
+ICQInterestInfo ICQUserInfoRequestTask::interestInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_interestInfoMap[seq];
}
-QString ICQUserInfoRequestTask::notesInfoFor( const QString& contact )
+TQString ICQUserInfoRequestTask::notesInfoFor( const TQString& contact )
{
int seq = m_reverseContactMap[contact];
return m_notesInfoMap[seq];
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h
index eba81b57..613608fd 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h
@@ -19,8 +19,8 @@
#ifndef ICQUSERINFOTASK_H
#define ICQUSERINFOTASK_H
-#include <qmap.h>
-#include <qstring.h>
+#include <tqmap.h>
+#include <tqstring.h>
#include "icqtask.h"
#include "icquserinfo.h"
@@ -39,37 +39,37 @@ public:
enum { Long = 0, Short };
- void setUser( const QString& user ) { m_userToRequestFor = user; }
+ void setUser( const TQString& user ) { m_userToRequestFor = user; }
void setType( unsigned int type ) { m_type = type; }
void setInfoToRequest( unsigned int type );
- ICQGeneralUserInfo generalInfoFor( const QString& contact );
- ICQEmailInfo emailInfoFor( const QString& contact );
- ICQMoreUserInfo moreInfoFor( const QString& contact );
- ICQWorkUserInfo workInfoFor( const QString& contact );
- QString notesInfoFor( const QString& contact );
- ICQShortInfo shortInfoFor( const QString& contact );
- ICQInterestInfo interestInfoFor( const QString& contact );
+ ICQGeneralUserInfo generalInfoFor( const TQString& contact );
+ ICQEmailInfo emailInfoFor( const TQString& contact );
+ ICQMoreUserInfo moreInfoFor( const TQString& contact );
+ ICQWorkUserInfo workInfoFor( const TQString& contact );
+ TQString notesInfoFor( const TQString& contact );
+ ICQShortInfo shortInfoFor( const TQString& contact );
+ ICQInterestInfo interestInfoFor( const TQString& contact );
virtual bool forMe( const Transfer* transfer ) const;
virtual bool take( Transfer* transfer );
virtual void onGo();
signals:
- void receivedInfoFor( const QString& contact, unsigned int type );
+ void receivedInfoFor( const TQString& contact, unsigned int type );
private:
- QMap<int, ICQGeneralUserInfo> m_genInfoMap;
- QMap<int, ICQEmailInfo> m_emailInfoMap;
- QMap<int, ICQMoreUserInfo> m_moreInfoMap;
- QMap<int, ICQWorkUserInfo> m_workInfoMap;
- QMap<int, ICQShortInfo> m_shortInfoMap;
- QMap<int, ICQInterestInfo> m_interestInfoMap;
- QMap<int, QString> m_notesInfoMap;
- QMap<int, QString> m_contactSequenceMap;
- QMap<QString, int> m_reverseContactMap;
+ TQMap<int, ICQGeneralUserInfo> m_genInfoMap;
+ TQMap<int, ICQEmailInfo> m_emailInfoMap;
+ TQMap<int, ICQMoreUserInfo> m_moreInfoMap;
+ TQMap<int, ICQWorkUserInfo> m_workInfoMap;
+ TQMap<int, ICQShortInfo> m_shortInfoMap;
+ TQMap<int, ICQInterestInfo> m_interestInfoMap;
+ TQMap<int, TQString> m_notesInfoMap;
+ TQMap<int, TQString> m_contactSequenceMap;
+ TQMap<TQString, int> m_reverseContactMap;
unsigned int m_type;
- QString m_userToRequestFor;
+ TQString m_userToRequestFor;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp
index abd34e53..b93ede3f 100644
--- a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp
+++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp
@@ -18,8 +18,8 @@
#include "inputprotocolbase.h"
-InputProtocolBase::InputProtocolBase(QObject *parent, const char *name)
- : QObject(parent, name)
+InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name)
+ : TQObject(parent, name)
{
m_state = NeedMore;
m_bytes = 0;
@@ -35,13 +35,13 @@ uint InputProtocolBase::state() const
return m_state;
}
-bool InputProtocolBase::readString( QString &message )
+bool InputProtocolBase::readString( TQString &message )
{
uint len;
- QCString rawData;
+ TQCString rawData;
if ( !safeReadBytes( rawData, len ) )
return false;
- message = QString::fromUtf8( rawData.data(), len - 1 );
+ message = TQString::fromUtf8( rawData.data(), len - 1 );
return true;
}
@@ -61,7 +61,7 @@ bool InputProtocolBase::okToProceed()
return false;
}
-bool InputProtocolBase::safeReadBytes( QCString & data, uint & len )
+bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
{
// read the length of the bytes
Q_UINT32 val;
@@ -72,7 +72,7 @@ bool InputProtocolBase::safeReadBytes( QCString & data, uint & len )
if ( val > 1024 )
return false;
//qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val );
- QCString temp( val );
+ TQCString temp( val );
if ( val != 0 )
{
if ( !okToProceed() )
diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
index 7bea895f..94072e00 100644
--- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h
+++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
@@ -19,7 +19,7 @@
#ifndef INPUTPROTOCOLBASE_H
#define INPUTPROTOCOLBASE_H
-#include <qobject.h>
+#include <tqobject.h>
class Transfer;
/**
@@ -32,7 +32,7 @@ class InputProtocolBase : public QObject
Q_OBJECT
public:
enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
- InputProtocolBase(QObject *parent = 0, const char *name = 0);
+ InputProtocolBase(TQObject *parent = 0, const char *name = 0);
~InputProtocolBase();
/**
* Returns a value describing the state of the object.
@@ -45,13 +45,13 @@ public:
* @param bytes this will be set to the number of bytes that were successfully parsed. It is no indication of the success of the whole procedure
* @return On success, a Transfer object that the caller is responsible for deleting. It will be either an EventTransfer or a Response, delete as appropriate. On failure, returns 0.
*/
- virtual Transfer * parse( const QByteArray &, uint & bytes ) = 0 ;
+ virtual Transfer * parse( const TQByteArray &, uint & bytes ) = 0 ;
protected:
/**
* Reads an arbitrary string
* updates the bytes parsed counter
*/
- bool readString( QString &message );
+ bool readString( TQString &message );
/**
* Check that there is data to read, and set the protocol's state if there isn't any.
*/
@@ -61,12 +61,12 @@ protected:
* updates the bytes parsed counter
* @return false if the string was broken or there was no data available at all
*/
- bool safeReadBytes( QCString & data, uint & len );
+ bool safeReadBytes( TQCString & data, uint & len );
protected:
uint m_state;
uint m_bytes;
- QDataStream * m_din;
+ TQDataStream * m_din;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.cpp b/kopete/protocols/oscar/liboscar/locationrightstask.cpp
index 5aae9a5e..f019b961 100644
--- a/kopete/protocols/oscar/liboscar/locationrightstask.cpp
+++ b/kopete/protocols/oscar/liboscar/locationrightstask.cpp
@@ -80,7 +80,7 @@ void LocationRightsTask::sendLocationRightsRequest()
void LocationRightsTask::handleLocationRightsResponse()
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Ignoring location rights response" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp
index 962b2e1a..a153f8f7 100644
--- a/kopete/protocols/oscar/liboscar/logintask.cpp
+++ b/kopete/protocols/oscar/liboscar/logintask.cpp
@@ -18,7 +18,7 @@
#include "logintask.h"
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include <klocale.h>
@@ -63,7 +63,7 @@ bool StageOneLoginTask::take( Transfer* transfer )
m_closeTask = new CloseConnectionTask( client()->rootTask() );
//connect finished signal
- connect( m_closeTask, SIGNAL( finished() ), this, SLOT( closeTaskFinished() ) );
+ connect( m_closeTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeTaskFinished() ) );
m_icqTask->go( true );
}
else
@@ -80,7 +80,7 @@ bool StageOneLoginTask::take( Transfer* transfer )
send( ft );
m_aimTask = new AimLoginTask( client()->rootTask() );
- connect( m_aimTask, SIGNAL( finished() ), this, SLOT( aimTaskFinished() ) );
+ connect( m_aimTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( aimTaskFinished() ) );
m_aimTask->go( true );
}
return true;
@@ -118,17 +118,17 @@ bool StageOneLoginTask::forMe( Transfer* transfer ) const
return ( ft && ft->flapChannel() == 1 );
}
-const QByteArray& StageOneLoginTask::loginCookie() const
+const TQByteArray& StageOneLoginTask::loginCookie() const
{
return m_cookie;
}
-const QString& StageOneLoginTask::bosServer() const
+const TQString& StageOneLoginTask::bosServer() const
{
return m_bosServer;
}
-const QString& StageOneLoginTask::bosPort() const
+const TQString& StageOneLoginTask::bosPort() const
{
return m_bosPort;
}
@@ -145,8 +145,8 @@ StageTwoLoginTask::StageTwoLoginTask( Task* parent )
m_versionTask = new ServerVersionsTask( rootTask );
m_rateTask = new RateInfoTask( rootTask );
- QObject::connect( m_versionTask, SIGNAL( finished() ), this, SLOT( versionTaskFinished() ) );
- QObject::connect( m_rateTask, SIGNAL( finished() ), this, SLOT( rateTaskFinished() ) );
+ TQObject::connect( m_versionTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( versionTaskFinished() ) );
+ TQObject::connect( m_rateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( rateTaskFinished() ) );
}
StageTwoLoginTask::~StageTwoLoginTask()
@@ -188,16 +188,16 @@ void StageTwoLoginTask::onGo()
send( ft );
}
else
- setError( -1, QString::null );
+ setError( -1, TQString::null );
return;
}
-void StageTwoLoginTask::setCookie( const QByteArray& newCookie )
+void StageTwoLoginTask::setCookie( const TQByteArray& newCookie )
{
m_cookie.duplicate( newCookie );
}
-const QByteArray& StageTwoLoginTask::cookie()
+const TQByteArray& StageTwoLoginTask::cookie()
{
return m_cookie;
}
@@ -210,7 +210,7 @@ void StageTwoLoginTask::versionTaskFinished()
void StageTwoLoginTask::rateTaskFinished()
{
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
#include "logintask.moc"
diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h
index 12061821..83bc8fde 100644
--- a/kopete/protocols/oscar/liboscar/logintask.h
+++ b/kopete/protocols/oscar/liboscar/logintask.h
@@ -19,7 +19,7 @@
#ifndef _OSCAR_LOGINTASK_H_
#define _OSCAR_LOGINTASK_H_
-#include <qcstring.h>
+#include <tqcstring.h>
#include "oscartypes.h"
#include "task.h"
@@ -52,19 +52,19 @@ public:
//Protocol specific stuff
//! Get the BOS cookie
- const QByteArray& loginCookie() const;
+ const TQByteArray& loginCookie() const;
//! Get the BOS server
- const QString& bosServer() const;
+ const TQString& bosServer() const;
//! Get the BOS port
- const QString& bosPort() const;
+ const TQString& bosPort() const;
//! Get the error code, if there is one
int errorCode() const;
//! Get the error reason so it can be displayed
- const QString& errorReason() const;
+ const TQString& errorReason() const;
public slots:
@@ -82,9 +82,9 @@ private:
CloseConnectionTask* m_closeTask;
//Private data we get from the tasks
- QByteArray m_cookie;
- QString m_bosServer;
- QString m_bosPort;
+ TQByteArray m_cookie;
+ TQString m_bosServer;
+ TQString m_bosPort;
};
@@ -111,13 +111,13 @@ public:
//protocol specifics
//! Set the cookie to send to the server
- void setCookie( const QByteArray& newCookie );
+ void setCookie( const TQByteArray& newCookie );
//! Get the cookie to send to the server
- const QByteArray& cookie();
+ const TQByteArray& cookie();
- QString host() const;
- QString port() const;
+ TQString host() const;
+ TQString port() const;
public slots:
@@ -131,8 +131,8 @@ protected:
bool forMe( Transfer* transfer ) const;
private:
- QByteArray m_cookie;
- QString m_host, m_port;
+ TQByteArray m_cookie;
+ TQString m_host, m_port;
//tasks
ServerVersionsTask* m_versionTask;
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
index 2db05eb1..0dd26e3d 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
@@ -16,7 +16,7 @@
#include "messagereceivertask.h"
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
#include <kdebug.h>
#include "transfer.h"
#include "buffer.h"
@@ -109,7 +109,7 @@ bool MessageReceiverTask::take( Transfer* transfer )
else
{
int screenNameLength = b->getByte();
- m_fromUser = QString( b->getBlock( screenNameLength ) );
+ m_fromUser = TQString( b->getBlock( screenNameLength ) );
setTransfer( transfer );
handleAutoResponse();
setTransfer( 0 );
@@ -122,7 +122,7 @@ bool MessageReceiverTask::take( Transfer* transfer )
void MessageReceiverTask::handleType1Message()
{
Oscar::Message msg;
- QValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
+ TQValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
TLV t = Oscar::findTLV( messageTLVList, 0x0002 );
if ( !t )
{
@@ -130,8 +130,8 @@ void MessageReceiverTask::handleType1Message()
return;
}
Buffer messageBuffer( t.data );
- QValueList<TLV> innerTLVList = messageBuffer.getTLVList();
- QValueList<TLV>::iterator it = innerTLVList.begin(), listEnd = innerTLVList.end();
+ TQValueList<TLV> innerTLVList = messageBuffer.getTLVList();
+ TQValueList<TLV>::iterator it = innerTLVList.begin(), listEnd = innerTLVList.end();
for ( ; (*it); ++it )
{
switch ( ( *it ).type )
@@ -154,7 +154,7 @@ void MessageReceiverTask::handleType1Message()
//message length is buffer length - length of ( charset + subcharset ) */
int msgLength = ( *it ).length - 4;
- QByteArray msgArray( message.getBlock( msgLength ) );
+ TQByteArray msgArray( message.getBlock( msgLength ) );
msg.setTextArray( msgArray );
break;
@@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message()
msg.setSender( m_fromUser );
msg.setReceiver( client()->userId() );
- msg.setTimestamp( QDateTime::currentDateTime() );
+ msg.setTimestamp( TQDateTime::currentDateTime() );
msg.setType( 0x01 );
emit receivedMessage( msg );
@@ -187,7 +187,7 @@ void MessageReceiverTask::handleType2Message()
kdDebug(14151) << k_funcinfo << "Received Type 2 message. Trying to handle it..." << endl;
Oscar::Message msg;
- QValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
+ TQValueList<TLV> messageTLVList = transfer()->buffer()->getTLVList();
TLV t = Oscar::findTLV( messageTLVList, 0x0005 );
if ( !t )
{
@@ -280,7 +280,7 @@ void MessageReceiverTask::handleType4Message()
Buffer tlv5buffer(tlv5.data, tlv5.length);
DWORD uin = tlv5buffer.getLEDWord(); // little endian for no sane reason!
- if ( QString::number(uin) != m_fromUser )
+ if ( TQString::number(uin) != m_fromUser )
kdWarning(14151) << k_funcinfo << "message uin does not match uin found in packet header!" << endl;
BYTE msgType = tlv5buffer.getByte();
@@ -291,7 +291,7 @@ void MessageReceiverTask::handleType4Message()
//handle the special user types
Oscar::Message msg;
- QString msgSender;
+ TQString msgSender;
switch ( msgType )
{
case 0x0D:
@@ -307,7 +307,7 @@ void MessageReceiverTask::handleType4Message()
break;
};
- QCString msgText = tlv5buffer.getLNTS();
+ TQCString msgText = tlv5buffer.getLNTS();
int msgLength = msgText.size();
if ( msgType == 0x0D || msgType == 0x0E )
{
@@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message()
}
msg.setType( 0x04 );
- msg.setTimestamp( QDateTime::currentDateTime() );
+ msg.setTimestamp( TQDateTime::currentDateTime() );
msg.setSender( msgSender );
msg.setReceiver( client()->userId() );
msg.setEncoding( Oscar::Message::UserDefined );
@@ -404,7 +404,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Message type is: " << messageType << endl;
- QCString msgText( b->getLELNTS() );
+ TQCString msgText( b->getLELNTS() );
Oscar::Message::Encoding encoding = Oscar::Message::UserDefined;
int fgcolor = 0x00000000;
int bgcolor = 0x00ffffff;
@@ -421,7 +421,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
if ( b->length() < capLength )
break;
- QByteArray cap( b->getBlock( capLength ) );
+ TQByteArray cap( b->getBlock( capLength ) );
if ( qstrncmp ( cap.data(), "{0946134E-4C7F-11D1-8222-444553540000}", capLength ) == 0 )
encoding = Oscar::Message::UTF8;
}
@@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
msg->setSender( m_fromUser );
msg->setReceiver( client()->userId() );
- msg->setTimestamp( QDateTime::currentDateTime() );
+ msg->setTimestamp( TQDateTime::currentDateTime() );
msg->setType( 0x02 );
msg->setIcbmCookie( m_icbmCookie );
msg->setProtocolVersion( protocolVersion );
@@ -451,7 +451,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
}
}
-QTextCodec* MessageReceiverTask::guessCodec( const QCString& string )
+TQTextCodec* MessageReceiverTask::guessCodec( const TQCString& string )
{
Q_UNUSED( string );
return 0;
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h
index b50a133f..4a129016 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.h
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h
@@ -17,8 +17,8 @@
#define MESSAGERECEIVERTASK_H
#include "task.h"
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
#include "oscarmessage.h"
#include "oscartypeclasses.h"
#include "oscarmessage.h"
@@ -61,13 +61,13 @@ private:
//!Parses Rendezvous data in Buffer and puts the information into Message
void parseRendezvousData( Buffer* b, Oscar::Message* msg );
- QTextCodec* guessCodec( const QCString& string );
+ TQTextCodec* guessCodec( const TQCString& string );
private:
- QByteArray m_icbmCookie;
+ TQByteArray m_icbmCookie;
int m_channel;
- QString m_fromUser;
+ TQString m_fromUser;
int m_currentSnacSubtype;
int m_charSet;
int m_subCharSet;
diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp
index d97da7a3..88d41a84 100644
--- a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp
+++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp
@@ -108,10 +108,10 @@ void OfflineMessagesTask::handleOfflineMessage()
BYTE flags = buffer->getByte(); // msg flags
WORD msgLength = buffer->getLEWord();
- QByteArray msg = buffer->getBlock( msgLength );
+ TQByteArray msg = buffer->getBlock( msgLength );
- QDate date(year, month, day);
- QTime time(hour,minute);
+ TQDate date(year, month, day);
+ TQTime time(hour,minute);
#ifndef HAVE_TM_GMTOFF
int tz = -( ::timezone );
#else
@@ -125,10 +125,10 @@ void OfflineMessagesTask::handleOfflineMessage()
#endif
time = time.addSecs( tz );
- QDateTime hackyTime( date, time );
+ TQDateTime hackyTime( date, time );
Oscar::Message message( Oscar::Message::UserDefined, msg, type, flags, hackyTime );
- message.setSender( QString::number( senderUin ) );
- message.setReceiver( QString::number( receiverUin ) );
+ message.setSender( TQString::number( senderUin ) );
+ message.setReceiver( TQString::number( receiverUin ) );
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Received offline message '" << msg.data() << "' from " << senderUin << endl;
diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp
index 785e23f7..6b6b3d05 100644
--- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp
+++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp
@@ -80,7 +80,7 @@ void OnlineNotifierTask::userOnline()
Buffer* buffer = transfer()->buffer();
UserDetails ud;
ud.fill( buffer );
- QString user = ud.userId();
+ TQString user = ud.userId();
//kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << user << " is now online" << endl;
emit userIsOnline( user, ud );
}
@@ -90,7 +90,7 @@ void OnlineNotifierTask::userOffline()
Buffer* buffer = transfer()->buffer();
UserDetails ud;
ud.fill( buffer );
- QString user = ud.userId();
+ TQString user = ud.userId();
//kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << user << " is now offline" << endl;
emit userIsOffline( user, ud );
}
diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
index 2ec58e5a..18bcb5c1 100644
--- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
+++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
@@ -46,8 +46,8 @@ protected:
virtual bool forMe( const Transfer* transfer ) const;
signals:
- void userIsOnline( const QString& user, const UserDetails& ud );
- void userIsOffline( const QString& user, const UserDetails& ud );
+ void userIsOnline( const TQString& user, const UserDetails& ud );
+ void userIsOffline( const TQString& user, const UserDetails& ud );
private:
void userOnline();
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
index ea090442..5f39d205 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
@@ -17,14 +17,14 @@
* *
***************************************************************************/
-#include <qobject.h>
+#include <tqobject.h>
#include <kbufferedsocket.h>
#include <kdebug.h>
#include <kresolver.h>
#include "oscarbytestream.h"
-KNetworkByteStream::KNetworkByteStream( QObject *parent, const char */*name*/ )
+KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ )
: ByteStream ( parent )
{
kdDebug( 14151 ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl;
@@ -38,14 +38,14 @@ KNetworkByteStream::KNetworkByteStream( QObject *parent, const char */*name*/ )
mSocket->enableRead( true );
// connect signals and slots
- QObject::connect( mSocket, SIGNAL ( gotError ( int ) ), this, SLOT ( slotError ( int ) ) );
- QObject::connect( mSocket, SIGNAL ( connected ( const KResolverEntry& ) ), this, SLOT ( slotConnected () ) );
- QObject::connect( mSocket, SIGNAL ( closed () ), this, SLOT ( slotConnectionClosed () ) );
- QObject::connect( mSocket, SIGNAL ( readyRead () ), this, SLOT ( slotReadyRead () ) );
- QObject::connect( mSocket, SIGNAL ( bytesWritten ( int ) ), this, SLOT ( slotBytesWritten ( int ) ) );
+ TQObject::connect( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) );
+ TQObject::connect( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) );
+ TQObject::connect( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) );
+ TQObject::connect( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) );
+ TQObject::connect( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) );
}
-bool KNetworkByteStream::connect( QString host, QString service )
+bool KNetworkByteStream::connect( TQString host, TQString service )
{
kdDebug( 14151 ) << k_funcinfo << "Connecting to " << host << ", service " << service << endl;
@@ -71,7 +71,7 @@ void KNetworkByteStream::close ()
int KNetworkByteStream::tryWrite ()
{
// send all data from the buffers to the socket
- QByteArray writeData = takeWrite();
+ TQByteArray writeData = takeWrite();
#ifdef OSCAR_EXCESSIVE_DEBUG
kdDebug(14151) << k_funcinfo << "writing " << writeData.size() << " bytes." << endl;
#endif
@@ -115,7 +115,7 @@ void KNetworkByteStream::slotConnectionClosed()
void KNetworkByteStream::slotReadyRead()
{
// stuff all available data into our buffers
- QByteArray readBuffer( socket()->bytesAvailable () );
+ TQByteArray readBuffer( socket()->bytesAvailable () );
socket()->readBlock( readBuffer.data (), readBuffer.size () );
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h
index bd618666..2ecd92d9 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.h
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h
@@ -37,11 +37,11 @@ class KNetworkByteStream : public ByteStream
Q_OBJECT
public:
- KNetworkByteStream ( QObject *parent = 0, const char *name = 0 );
+ KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 );
~KNetworkByteStream ();
- bool connect ( QString host, QString service );
+ bool connect ( TQString host, TQString service );
virtual bool isOpen () const;
virtual void close ();
diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
index e607a24b..87da6020 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
@@ -20,10 +20,10 @@
#include "oscarclientstream.h"
-#include <qguardedptr.h>
-#include <qobject.h>
-#include <qptrqueue.h>
-#include <qtimer.h>
+#include <tqguardedptr.h>
+#include <tqobject.h>
+#include <tqptrqueue.h>
+#include <tqtimer.h>
#include <kdebug.h>
@@ -36,7 +36,7 @@
#define LIBOSCAR_DEBUG 0
-void cs_dump( const QByteArray &bytes );
+void cs_dump( const TQByteArray &bytes );
enum {
Idle,
@@ -59,9 +59,9 @@ public:
bs = 0;
connection = 0;
- username = QString::null;
- password = QString::null;
- server = QString::null;
+ username = TQString::null;
+ password = TQString::null;
+ server = TQString::null;
haveLocalAddr = false;
doBinding = true;
@@ -74,12 +74,12 @@ public:
newTransfers = false;
}
- QString username;
- QString password;
- QString server;
+ TQString username;
+ TQString password;
+ TQString server;
bool doAuth; //send the initial login sequences to get the cookie
bool haveLocalAddr;
- QHostAddress localAddr;
+ TQHostAddress localAddr;
Q_UINT16 localPort;
bool doBinding;
@@ -88,7 +88,7 @@ public:
CoreProtocol client;
Connection* connection;
- QString defRealm;
+ TQString defRealm;
int mode;
int state;
@@ -96,15 +96,15 @@ public:
bool newTransfers;
int errCond;
- QString errText;
+ TQString errText;
- QPtrQueue<Transfer> in;
+ TQPtrQueue<Transfer> in;
- QTimer noopTimer; // used to send icq keepalive
+ TQTimer noopTimer; // used to send icq keepalive
int noop_time;
};
-ClientStream::ClientStream(Connector *conn, QObject *parent)
+ClientStream::ClientStream(Connector *conn, TQObject *parent)
:Stream(parent)
{
//qDebug("CLIENTSTREAM::ClientStream");
@@ -112,13 +112,13 @@ ClientStream::ClientStream(Connector *conn, QObject *parent)
d = new Private;
d->mode = ClientMode;
d->conn = conn;
- connect( d->conn, SIGNAL(connected()), SLOT(cr_connected()) );
- connect( d->conn, SIGNAL(error()), SLOT(cr_error()) );
- connect( &d->client, SIGNAL( outgoingData( const QByteArray& ) ), SLOT ( cp_outgoingData( const QByteArray & ) ) );
- connect( &d->client, SIGNAL( incomingData() ), SLOT ( cp_incomingData() ) );
+ connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) );
+ connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) );
+ connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) );
+ connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) );
d->noop_time = 0;
- connect(&d->noopTimer, SIGNAL(timeout()), SLOT(doNoop()));
+ connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop()));
}
ClientStream::~ClientStream()
@@ -151,7 +151,7 @@ void ClientStream::reset(bool all)
d->in.clear();
}
-void ClientStream::connectToServer(const QString& server, bool auth)
+void ClientStream::connectToServer(const TQString& server, bool auth)
{
reset(true);
d->state = Connecting;
@@ -205,7 +205,7 @@ void ClientStream::setNoopTime(int mills)
d->noopTimer.start( d->noop_time );
}
-void ClientStream::setLocalAddr(const QHostAddress &addr, Q_UINT16 port)
+void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
{
d->haveLocalAddr = true;
d->localAddr = addr;
@@ -217,7 +217,7 @@ int ClientStream::errorCondition() const
return d->errCond;
}
-QString ClientStream::errorText() const
+TQString ClientStream::errorText() const
{
return d->errText;
}
@@ -263,7 +263,7 @@ void ClientStream::write( Transfer *request )
d->client.outgoingTransfer( request );
}
-void cs_dump( const QByteArray &bytes )
+void cs_dump( const TQByteArray &bytes )
{
#if 0
qDebug( "contains: %i bytes ", bytes.count() );
@@ -305,7 +305,7 @@ void cs_dump( const QByteArray &bytes )
Q_UNUSED( bytes );
}
-void ClientStream::cp_outgoingData( const QByteArray& outgoingBytes )
+void ClientStream::cp_outgoingData( const TQByteArray& outgoingBytes )
{
// take formatted bytes from CoreProtocol and put them on the wire
d->bs->write( outgoingBytes );
@@ -329,19 +329,19 @@ void ClientStream::cp_incomingData()
void ClientStream::cr_connected()
{
d->bs = d->conn->stream();
- connect(d->bs, SIGNAL(connectionClosed()), SLOT(bs_connectionClosed()));
- connect(d->bs, SIGNAL(delayedCloseFinished()), SLOT(bs_delayedCloseFinished()));
- connect(d->bs, SIGNAL(readyRead()), SLOT(bs_readyRead()));
- connect(d->bs, SIGNAL(bytesWritten(int)), SLOT(bs_bytesWritten(int)));
- connect(d->bs, SIGNAL(error(int)), SLOT(bs_error(int)));
+ connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
+ connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
+ connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead()));
+ connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int)));
+ connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
d->state = Active;
if ( d->noop_time )
d->noopTimer.start( d->noop_time );
- QByteArray spare = d->bs->read();
+ TQByteArray spare = d->bs->read();
- QGuardedPtr<QObject> self = this;
+ TQGuardedPtr<TQObject> self = this;
emit connected();
if(!self)
return;
@@ -372,12 +372,12 @@ void ClientStream::bs_error(int)
void ClientStream::bs_readyRead()
{
- QByteArray a;
+ TQByteArray a;
//qDebug( "size of storage for incoming data is %i bytes.", a.size() );
a = d->bs->read();
#if LIBOSCAR_DEBUG
- QCString cs(a.data(), a.size()+1);
+ TQCString cs(a.data(), a.size()+1);
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "recv: " << a.size() << "bytes" << endl;
cs_dump( a );
#endif
@@ -408,7 +408,7 @@ void ClientStream::processNext()
{
if( !d->in.isEmpty() )
{
- QTimer::singleShot(0, this, SLOT(doReadyRead()));
+ TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead()));
}
}
diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h
index f8b4d2b6..307c0616 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.h
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h
@@ -73,19 +73,19 @@ public:
BindConflict // resource in-use
};
- ClientStream(Connector *conn, QObject *parent=0);
+ ClientStream(Connector *conn, TQObject *parent=0);
~ClientStream();
- void connectToServer(const QString& server, bool auth=true);
+ void connectToServer(const TQString& server, bool auth=true);
void accept(); // server
bool isActive() const;
bool isAuthenticated() const;
// login params
- void setUsername(const QString &s);
- void setPassword(const QString &s);
+ void setUsername(const TQString &s);
+ void setPassword(const TQString &s);
- void setLocalAddr(const QHostAddress &addr, Q_UINT16 port);
+ void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port);
void close();
@@ -110,10 +110,10 @@ public:
void write( Transfer* request );
int errorCondition() const;
- QString errorText() const;
+ TQString errorText() const;
// extrahttp://bugs.kde.org/show_bug.cgi?id=85158
-/*# void writeDirect(const QString &s); // must be for debug testing*/
+/*# void writeDirect(const TQString &s); // must be for debug testing*/
void setNoopTime(int mills);
signals:
@@ -130,7 +130,7 @@ private slots:
/**
* collects wire ready outgoing data from the core protocol and sends
*/
- void cp_outgoingData( const QByteArray& );
+ void cp_outgoingData( const TQByteArray& );
/**
* collects parsed incoming data as a transfer from the core protocol and queues
*/
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
index 6fcef197..ec649e08 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp
@@ -24,7 +24,7 @@
#include "oscarconnector.h"
#include "oscarbytestream.h"
-KNetworkConnector::KNetworkConnector( QObject *parent, const char */*name*/ )
+KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ )
: Connector( parent )
{
kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl;
@@ -33,8 +33,8 @@ KNetworkConnector::KNetworkConnector( QObject *parent, const char */*name*/ )
mByteStream = new KNetworkByteStream( this );
- connect( mByteStream, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) );
- connect( mByteStream, SIGNAL ( error ( int ) ), this, SLOT ( slotError ( int ) ) );
+ connect( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
+ connect( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) );
mPort = 0;
}
@@ -43,7 +43,7 @@ KNetworkConnector::~KNetworkConnector()
delete mByteStream;
}
-void KNetworkConnector::connectToServer( const QString &server )
+void KNetworkConnector::connectToServer( const TQString &server )
{
kdDebug( 14151 ) << k_funcinfo << "Initiating connection to " << mHost << endl;
Q_ASSERT( !mHost.isNull() );
@@ -51,7 +51,7 @@ void KNetworkConnector::connectToServer( const QString &server )
mErrorCode = KNetwork::KSocketBase::NoError;
- if ( !mByteStream->connect ( mHost, QString::number ( mPort ) ) )
+ if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
{
// Houston, we have a problem
mErrorCode = mByteStream->socket()->error();
@@ -65,7 +65,7 @@ void KNetworkConnector::slotConnected()
// FIXME: setPeerAddress() is something different, find out correct usage later
//KInetSocketAddress inetAddress = mStreamSocket->address().asInet().makeIPv6 ();
- //setPeerAddress ( QHostAddress ( inetAddress.ipAddress().addr () ), inetAddress.port () );
+ //setPeerAddress ( TQHostAddress ( inetAddress.ipAddress().addr () ), inetAddress.port () );
emit connected ();
}
@@ -94,7 +94,7 @@ void KNetworkConnector::done()
mByteStream->close ();
}
-void KNetworkConnector::setOptHostPort( const QString &host, Q_UINT16 port )
+void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port )
{
kdDebug ( 14151 ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl;
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h
index d130f7da..39696a35 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.h
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.h
@@ -39,15 +39,15 @@ class KNetworkConnector : public Connector
Q_OBJECT
public:
- KNetworkConnector( QObject *parent = 0, const char *name = 0 );
+ KNetworkConnector( TQObject *parent = 0, const char *name = 0 );
virtual ~KNetworkConnector();
- virtual void connectToServer( const QString &server );
+ virtual void connectToServer( const TQString &server );
virtual ByteStream *stream() const;
virtual void done();
- void setOptHostPort( const QString &host, Q_UINT16 port );
+ void setOptHostPort( const TQString &host, Q_UINT16 port );
int errorCode();
@@ -56,7 +56,7 @@ private slots:
void slotError( int );
private:
- QString mHost;
+ TQString mHost;
Q_UINT16 mPort;
int mErrorCode;
diff --git a/kopete/protocols/oscar/liboscar/oscarmessage.cpp b/kopete/protocols/oscar/liboscar/oscarmessage.cpp
index f4f512d2..1f263be0 100644
--- a/kopete/protocols/oscar/liboscar/oscarmessage.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarmessage.cpp
@@ -19,8 +19,8 @@
#include "oscarmessage.h"
-#include <qdeepcopy.h>
-#include <qtextcodec.h>
+#include <tqdeepcopy.h>
+#include <tqtextcodec.h>
Oscar::Message::Message()
@@ -33,7 +33,7 @@ Oscar::Message::Message()
{
}
-Oscar::Message::Message( Encoding messageEncoding, const QByteArray& messageText, int channel, int properties, QDateTime timestamp )
+Oscar::Message::Message( Encoding messageEncoding, const TQByteArray& messageText, int channel, int properties, TQDateTime timestamp )
: m_channel( channel ),
m_properties( properties ),
m_messageType( 0 ),
@@ -45,7 +45,7 @@ Oscar::Message::Message( Encoding messageEncoding, const QByteArray& messageText
{
}
-Oscar::Message::Message( Encoding messageEncoding, const QCString& messageText, int channel, int properties, QDateTime timestamp )
+Oscar::Message::Message( Encoding messageEncoding, const TQCString& messageText, int channel, int properties, TQDateTime timestamp )
: m_channel( channel ),
m_properties( properties ),
m_messageType( 0 ),
@@ -57,7 +57,7 @@ Oscar::Message::Message( Encoding messageEncoding, const QCString& messageText,
setTextArray( messageText );
}
-Oscar::Message::Message( Encoding messageEncoding, const QString& messageText, int channel, int properties, QDateTime timestamp, QTextCodec* codec )
+Oscar::Message::Message( Encoding messageEncoding, const TQString& messageText, int channel, int properties, TQDateTime timestamp, TQTextCodec* codec )
: m_channel( channel ),
m_properties( properties ),
m_messageType( 0 ),
@@ -68,50 +68,50 @@ Oscar::Message::Message( Encoding messageEncoding, const QString& messageText, i
setText( messageEncoding, messageText, codec );
}
-QString Oscar::Message::sender() const
+TQString Oscar::Message::sender() const
{
return m_sender;
}
-void Oscar::Message::setSender( const QString& sender )
+void Oscar::Message::setSender( const TQString& sender )
{
m_sender = sender;
}
-QString Oscar::Message::receiver() const
+TQString Oscar::Message::receiver() const
{
return m_receiver;
}
-void Oscar::Message::setReceiver( const QString& receiver )
+void Oscar::Message::setReceiver( const TQString& receiver )
{
m_receiver = receiver;
}
-QByteArray Oscar::Message::textArray() const
+TQByteArray Oscar::Message::textArray() const
{
return m_textArray;
}
-QString Oscar::Message::text( QTextCodec *codec ) const
+TQString Oscar::Message::text( TQTextCodec *codec ) const
{
switch ( m_encoding )
{
case Oscar::Message::UserDefined:
return codec->toUnicode( m_textArray );
case Oscar::Message::UTF8:
- return QString::fromUtf8( m_textArray.data(), m_textArray.size() );
+ return TQString::fromUtf8( m_textArray.data(), m_textArray.size() );
case Oscar::Message::UCS2:
{
uint len = m_textArray.size() / 2;
- QString result;
+ TQString result;
result.setLength( len );
- QByteArray::ConstIterator p = m_textArray.begin();
+ TQByteArray::ConstIterator p = m_textArray.begin();
for ( uint i = 0; i < len; i++)
{
char row = *p++;
char cell = *p++;
- result[i] = QChar( cell, row );
+ result[i] = TQChar( cell, row );
}
//check if last character isn't null
if ( result[len-1].isNull() )
@@ -122,22 +122,22 @@ QString Oscar::Message::text( QTextCodec *codec ) const
default:
break; // Should never happen.
}
- return QString::null;
+ return TQString::null;
//FIXME: warn at least with kdWarning if an unrecognised encoding style was seen.
}
-void Oscar::Message::setText( Oscar::Message::Encoding newEncoding, const QString& newText, QTextCodec* codec )
+void Oscar::Message::setText( Oscar::Message::Encoding newEncoding, const TQString& newText, TQTextCodec* codec )
{
uint len;
switch ( newEncoding )
{
case Oscar::Message::UserDefined:
- // Oscar::Message::setTextArray( const QCString& )
+ // Oscar::Message::setTextArray( const TQCString& )
// strips trailing null byte automatically.
setTextArray( codec->fromUnicode( newText ) );
break;
case Oscar::Message::UTF8:
- // Oscar::Message::setTextArray( const QCString& )
+ // Oscar::Message::setTextArray( const TQCString& )
// strips trailing null byte automatically.
setTextArray( newText.utf8() );
break;
@@ -145,7 +145,7 @@ void Oscar::Message::setText( Oscar::Message::Encoding newEncoding, const QStrin
{
len = newText.length();
m_textArray.resize( len * 2 );
- QByteArray::Iterator p = m_textArray.begin();
+ TQByteArray::Iterator p = m_textArray.begin();
for ( uint i = 0; i < len; i++)
{
*p++ = newText[i].row();
@@ -159,12 +159,12 @@ void Oscar::Message::setText( Oscar::Message::Encoding newEncoding, const QStrin
m_encoding = newEncoding;
}
-void Oscar::Message::setTextArray( const QByteArray& newTextArray )
+void Oscar::Message::setTextArray( const TQByteArray& newTextArray )
{
m_textArray.duplicate( newTextArray );
}
-void Oscar::Message::setTextArray( const QCString& newTextArray )
+void Oscar::Message::setTextArray( const TQCString& newTextArray )
{
m_textArray.duplicate( newTextArray );
uint len = m_textArray.size();
@@ -212,22 +212,22 @@ void Oscar::Message::setType( int newType )
m_channel = newType;
}
-QDateTime Oscar::Message::timestamp() const
+TQDateTime Oscar::Message::timestamp() const
{
return m_timestamp;
}
-void Oscar::Message::setTimestamp( QDateTime ts )
+void Oscar::Message::setTimestamp( TQDateTime ts )
{
m_timestamp = ts;
}
-QByteArray Oscar::Message::icbmCookie() const
+TQByteArray Oscar::Message::icbmCookie() const
{
return m_icbmCookie;
}
-void Oscar::Message::setIcbmCookie( const QByteArray& cookie )
+void Oscar::Message::setIcbmCookie( const TQByteArray& cookie )
{
m_icbmCookie.duplicate( cookie );
}
@@ -272,12 +272,12 @@ void Oscar::Message::setExchange( Oscar::WORD exchange )
m_exchange = exchange;
}
-QString Oscar::Message::chatRoom() const
+TQString Oscar::Message::chatRoom() const
{
return m_chatRoom;
}
-void Oscar::Message::setChatRoom( const QString& room )
+void Oscar::Message::setChatRoom( const TQString& room )
{
m_chatRoom = room;
}
diff --git a/kopete/protocols/oscar/liboscar/oscarmessage.h b/kopete/protocols/oscar/liboscar/oscarmessage.h
index 7f081054..f6f08fd9 100644
--- a/kopete/protocols/oscar/liboscar/oscarmessage.h
+++ b/kopete/protocols/oscar/liboscar/oscarmessage.h
@@ -21,10 +21,10 @@
#ifndef _OSCARMESSAGE_H_
#define _OSCARMESSAGE_H_
-#include <qglobal.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qdatetime.h>
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
#include "kopete_export.h"
#include "oscartypes.h"
@@ -62,36 +62,36 @@ public:
Message();
- Message( Encoding messageEncoding, const QByteArray& messageText, int channel, int properties, QDateTime timestamp );
- Message( Encoding messageEncoding, const QCString& messageText, int channel, int properties, QDateTime timestamp );
- Message( Encoding messageEncoding, const QString& messageText, int channel, int properties, QDateTime timestamp, QTextCodec* codec = 0 );
+ Message( Encoding messageEncoding, const TQByteArray& messageText, int channel, int properties, TQDateTime timestamp );
+ Message( Encoding messageEncoding, const TQCString& messageText, int channel, int properties, TQDateTime timestamp );
+ Message( Encoding messageEncoding, const TQString& messageText, int channel, int properties, TQDateTime timestamp, TQTextCodec* codec = 0 );
/** Get the sender of the message */
- QString sender() const;
+ TQString sender() const;
/** Set the sender of the message */
- void setSender( const QString& sender );
+ void setSender( const TQString& sender );
/** Get the receiver of the message */
- QString receiver() const;
+ TQString receiver() const;
/** Set the receiver of the message */
- void setReceiver( const QString& receiver);
+ void setReceiver( const TQString& receiver);
/** get the message text */
- QString text( QTextCodec* codec ) const;
+ TQString text( TQTextCodec* codec ) const;
/** set the message text */
- void setText( Encoding newEncoding, const QString& newText, QTextCodec* codec = 0);
+ void setText( Encoding newEncoding, const TQString& newText, TQTextCodec* codec = 0);
/** get the message text as a bytearray for decoding */
- QByteArray textArray() const;
+ TQByteArray textArray() const;
/** set the message text as a bytearray for decoding */
- void setTextArray( const QByteArray& newTextArray );
+ void setTextArray( const TQByteArray& newTextArray );
/** set the mesasge text as a bytearray for decoding */
- void setTextArray( const QCString& newTextArray );
+ void setTextArray( const TQCString& newTextArray );
/** get the message properties */
int properties() const;
@@ -109,16 +109,16 @@ public:
void setType( int newType );
/** get the timestamp of the message */
- QDateTime timestamp() const;
+ TQDateTime timestamp() const;
/** set the timestamp of the message */
- void setTimestamp( QDateTime ts );
+ void setTimestamp( TQDateTime ts );
/** get the ICBM cookie of the message */
- QByteArray icbmCookie() const;
+ TQByteArray icbmCookie() const;
/** set the ICBM cookie of the message */
- void setIcbmCookie( const QByteArray& cookie );
+ void setIcbmCookie( const TQByteArray& cookie );
/** get the protocol version (channel 2 messages only) */
int protocolVersion() const;
@@ -145,10 +145,10 @@ public:
void setExchange( Oscar::WORD );
/** get the chat room that this message is for */
- QString chatRoom() const;
+ TQString chatRoom() const;
/** set the chat room that this message is for */
- void setChatRoom( const QString& );
+ void setChatRoom( const TQString& );
/** get the message encoding */
Encoding encoding() const;
@@ -160,18 +160,18 @@ public:
private:
//TODO d-pointer
- QString m_sender;
- QString m_receiver;
+ TQString m_sender;
+ TQString m_receiver;
int m_channel;
int m_properties;
int m_messageType;
int m_protocolVersion;
int m_channel2Counter;
- QByteArray m_icbmCookie;
- QByteArray m_textArray;
- QDateTime m_timestamp;
+ TQByteArray m_icbmCookie;
+ TQByteArray m_textArray;
+ TQDateTime m_timestamp;
Oscar::WORD m_exchange;
- QString m_chatRoom;
+ TQString m_chatRoom;
Encoding m_encoding;
};
diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
index cd9e9619..be862872 100644
--- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
+++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
@@ -17,8 +17,8 @@
*/
#include "oscartypeclasses.h"
-#include <qdeepcopy.h>
-#include <qvaluelist.h>
+#include <tqdeepcopy.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
#include "oscarutils.h"
#include "buffer.h"
@@ -40,7 +40,7 @@ Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, char* newData )
data.duplicate( newData, length );
}
-Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, const QByteArray& newData )
+Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, const TQByteArray& newData )
{
type = newType;
length = newLength;
@@ -70,7 +70,7 @@ Oscar::SSI::SSI()
m_waitingAuth = false;
}
-Oscar::SSI::SSI( const QString &name, int gid, int bid, int type, const QValueList<TLV> &tlvlist, int tlvLength )
+Oscar::SSI::SSI( const TQString &name, int gid, int bid, int type, const TQValueList<TLV> &tlvlist, int tlvLength )
{
m_name = name;
m_gid = gid;
@@ -79,7 +79,7 @@ Oscar::SSI::SSI( const QString &name, int gid, int bid, int type, const QValueLi
m_tlvLength = tlvLength;
//deepcopy the tlvs
- m_tlvList = QDeepCopy< QValueList<TLV> >( tlvlist );
+ m_tlvList = TQDeepCopy< TQValueList<TLV> >( tlvlist );
if ( m_tlvLength == 0 && !m_tlvList.isEmpty() )
refreshTLVLength();
@@ -98,7 +98,7 @@ Oscar::SSI::SSI( const Oscar::SSI& other )
m_waitingAuth = other.m_waitingAuth;
//deepcopy the tlvs
- m_tlvList = QDeepCopy< QValueList<TLV> >( other.m_tlvList );
+ m_tlvList = TQDeepCopy< TQValueList<TLV> >( other.m_tlvList );
if ( m_tlvLength == 0 && !m_tlvList.isEmpty() )
refreshTLVLength();
@@ -109,7 +109,7 @@ bool Oscar::SSI::isValid() const
return m_type != 0xFFFF;
}
-QString Oscar::SSI::name() const
+TQString Oscar::SSI::name() const
{
return m_name;
}
@@ -129,7 +129,7 @@ Q_UINT16 Oscar::SSI::type() const
return m_type;
}
-const QValueList<TLV>& Oscar::SSI::tlvList() const
+const TQValueList<TLV>& Oscar::SSI::tlvList() const
{
return m_tlvList;
}
@@ -144,10 +144,10 @@ Q_UINT16 Oscar::SSI::tlvListLength() const
return m_tlvLength;
}
-void Oscar::SSI::setTLVList( QValueList<TLV> list )
+void Oscar::SSI::setTLVList( TQValueList<TLV> list )
{
//deepcopy the tlvs
- m_tlvList = QDeepCopy< QValueList<TLV> >( list );
+ m_tlvList = TQDeepCopy< TQValueList<TLV> >( list );
refreshTLVLength();
checkTLVs();
}
@@ -155,7 +155,7 @@ void Oscar::SSI::setTLVList( QValueList<TLV> list )
void Oscar::SSI::refreshTLVLength()
{
m_tlvLength = 0;
- QValueList<TLV>::iterator it = m_tlvList.begin();
+ TQValueList<TLV>::iterator it = m_tlvList.begin();
for( ; it != m_tlvList.end(); ++it )
{
m_tlvLength += 4;
@@ -179,7 +179,7 @@ void Oscar::SSI::checkTLVs()
TLV aliasTLV = findTLV( m_tlvList, 0x0131 );
if ( aliasTLV )
{
- m_alias = QString::fromUtf8( aliasTLV.data, aliasTLV.length );
+ m_alias = TQString::fromUtf8( aliasTLV.data, aliasTLV.length );
kdDebug( 14151 ) << k_funcinfo << "Got an alias '" << m_alias << "' for contact '" << m_name << "'" << endl;
}
@@ -192,12 +192,12 @@ void Oscar::SSI::checkTLVs()
kdDebug(14151) << k_funcinfo << "Found 'allow others to see...' options " << infoTLV.data << endl;
}
-QString Oscar::SSI::alias() const
+TQString Oscar::SSI::alias() const
{
return m_alias;
}
-void Oscar::SSI::setAlias( const QString& newAlias )
+void Oscar::SSI::setAlias( const TQString& newAlias )
{
m_alias = newAlias;
}
@@ -212,28 +212,28 @@ void Oscar::SSI::setWaitingAuth( bool waiting )
m_waitingAuth = waiting;
}
-void Oscar::SSI::setIconHash( QByteArray hash )
+void Oscar::SSI::setIconHash( TQByteArray hash )
{
m_hash.duplicate( hash );
}
-QByteArray Oscar::SSI::iconHash( ) const
+TQByteArray Oscar::SSI::iconHash( ) const
{
return m_hash;
}
-QString Oscar::SSI::toString() const
+TQString Oscar::SSI::toString() const
{
- QString ssiString = QString::fromLatin1( "name: " );
+ TQString ssiString = TQString::fromLatin1( "name: " );
ssiString += m_name;
ssiString += " gid: ";
- ssiString += QString::number( m_gid );
+ ssiString += TQString::number( m_gid );
ssiString += " bid: ";
- ssiString += QString::number( m_bid );
+ ssiString += TQString::number( m_bid );
ssiString += " type: ";
- ssiString += QString::number( m_type );
+ ssiString += TQString::number( m_type );
ssiString += " tlv length: ";
- ssiString += QString::number( m_tlvLength );
+ ssiString += TQString::number( m_tlvLength );
return ssiString;
}
@@ -250,26 +250,26 @@ Oscar::SSI::operator bool() const
return isValid();
}
-Oscar::SSI::operator QByteArray() const
+Oscar::SSI::operator TQByteArray() const
{
Buffer b;
- QCString name( m_name.utf8() );
+ TQCString name( m_name.utf8() );
uint namelen = name.length();
const char *namedata = name;
b.addWord( namelen );
// Using namedata instead of name because
- // Buffer::addString(QByteArray, DWORD) ignores it's second argument,
+ // Buffer::addString(TQByteArray, DWORD) ignores it's second argument,
// while Buffer::addString(const char*, DWORD) does not ignore it.
// We must provide the explicit length argument to addString() because
// we don't need trailing null byte to be added when automatic
- // conversion from QCString to QByteArray is performed.
+ // conversion from TQCString to TQByteArray is performed.
// This hack will not be needed with Qt 4.
b.addString( namedata, namelen );
b.addWord( m_gid );
b.addWord( m_bid );
b.addWord( m_type );
b.addWord( m_tlvLength );
- QValueList<Oscar::TLV>::const_iterator it = m_tlvList.begin();
+ TQValueList<Oscar::TLV>::const_iterator it = m_tlvList.begin();
for( ; it != m_tlvList.end(); ++it )
{
b.addWord( (*it).type );
@@ -277,7 +277,7 @@ Oscar::SSI::operator QByteArray() const
b.addString( (*it).data, (*it).data.size() );
}
- return (QByteArray) b;
+ return (TQByteArray) b;
}
diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.h b/kopete/protocols/oscar/liboscar/oscartypeclasses.h
index 94e0c910..e4ec6ded 100644
--- a/kopete/protocols/oscar/liboscar/oscartypeclasses.h
+++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.h
@@ -20,10 +20,10 @@
#ifndef _OSCARTYPECLASSES_H_
#define _OSCARTYPECLASSES_H_
-#include <qglobal.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qvaluelist.h>
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqvaluelist.h>
#include "kopete_export.h"
namespace Oscar
@@ -34,14 +34,14 @@ public:
TLV();
TLV( Q_UINT16, Q_UINT16, char* data );
- TLV( Q_UINT16, Q_UINT16, const QByteArray& );
+ TLV( Q_UINT16, Q_UINT16, const TQByteArray& );
TLV( const TLV& t );
operator bool() const;
Q_UINT16 type;
Q_UINT16 length;
- QByteArray data;
+ TQByteArray data;
};
@@ -49,7 +49,7 @@ class KOPETE_EXPORT SSI
{
public:
SSI();
- SSI( const QString &name, int gid, int bid, int type, const QValueList<TLV>& tlvlist, int tlvLength = 0 );
+ SSI( const TQString &name, int gid, int bid, int type, const TQValueList<TLV>& tlvlist, int tlvLength = 0 );
SSI( const SSI& other );
/** Get the validity of this item */
@@ -57,7 +57,7 @@ public:
/** \brief The name of this SSI item.
* This is usually the screenname, ICQ number, or group name. */
- QString name() const;
+ TQString name() const;
/** \brief The group id of the SSI item */
Q_UINT16 gid() const;
@@ -73,10 +73,10 @@ public:
Q_UINT16 type() const;
/** \brief the TLV list for the item */
- const QValueList<TLV>& tlvList() const;
+ const TQValueList<TLV>& tlvList() const;
/** \brief Set the TLV list for the item */
- void setTLVList( QValueList<TLV> );
+ void setTLVList( TQValueList<TLV> );
/**
* \brief Set the length of the TLV list
@@ -93,14 +93,14 @@ public:
* Get the alias for the SSI item
* This is TLV 0x0131 in an SSI item
*/
- QString alias() const;
+ TQString alias() const;
/**
* Set the alias for the SSI item
* This should be done after a successful modification of the item
* on the server
*/
- void setAlias( const QString& newAlias );
+ void setAlias( const TQString& newAlias );
/** \brief Indicates we're awaiting authorization from this item */
bool waitingAuth() const;
@@ -108,17 +108,17 @@ public:
/** Set whether we are waiting authorization or not from this item */
void setWaitingAuth( bool waiting );
- void setIconHash( QByteArray hash );
+ void setIconHash( TQByteArray hash );
- QByteArray iconHash() const;
+ TQByteArray iconHash() const;
/** \brief String representation of our SSI object */
- QString toString() const;
+ TQString toString() const;
bool operator==( const SSI& item ) const;
operator bool() const;
- operator QByteArray() const;
+ operator TQByteArray() const;
void refreshTLVLength();
@@ -126,15 +126,15 @@ public:
void checkTLVs();
private:
- QString m_name;
+ TQString m_name;
int m_gid;
int m_bid;
int m_type;
- QValueList<TLV> m_tlvList;
+ TQValueList<TLV> m_tlvList;
int m_tlvLength;
bool m_waitingAuth;
- QString m_alias;
- QByteArray m_hash;
+ TQString m_alias;
+ TQByteArray m_hash;
};
}
diff --git a/kopete/protocols/oscar/liboscar/oscartypes.h b/kopete/protocols/oscar/liboscar/oscartypes.h
index b7d4f55b..3819b555 100644
--- a/kopete/protocols/oscar/liboscar/oscartypes.h
+++ b/kopete/protocols/oscar/liboscar/oscartypes.h
@@ -20,9 +20,9 @@
#define _OSCARTYPES_H_
#include "oscartypeclasses.h"
-#include <qglobal.h>
-#include <qdatetime.h>
-#include <qstring.h>
+#include <tqglobal.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
//! Debug Areas
const int OSCAR_RAW_DEBUG = 14151;
@@ -214,35 +214,35 @@ struct ChatExchangeInfo
WORD maxRoomNameLength;
WORD maxMsgLength;
BYTE flags;
- QString description;
+ TQString description;
BYTE canCreate;
- QString charset1;
- QString charset2;
- QString lang1;
- QString lang2;
+ TQString charset1;
+ TQString charset2;
+ TQString lang1;
+ TQString lang2;
};
struct ChatRoomInfo
{
WORD exchange;
- QByteArray cookie;
+ TQByteArray cookie;
WORD instance;
- QString description;
+ TQString description;
WORD maxMsgLength;
- QString name;
+ TQString name;
};
struct ClientVersion
{
- QString clientString;
+ TQString clientString;
WORD clientId;
WORD major;
WORD minor;
WORD point;
WORD build;
DWORD other;
- QString country;
- QString lang;
+ TQString country;
+ TQString lang;
};
/* ICQ Version Characteristics */
diff --git a/kopete/protocols/oscar/liboscar/oscarutils.cpp b/kopete/protocols/oscar/liboscar/oscarutils.cpp
index 13e28d9e..e07e0e12 100644
--- a/kopete/protocols/oscar/liboscar/oscarutils.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarutils.cpp
@@ -17,16 +17,16 @@
*/
#include "oscarutils.h"
-#include <qhostaddress.h>
+#include <tqhostaddress.h>
#include <kapplication.h>
#include <kdebug.h>
using namespace Oscar;
-QString Oscar::normalize( const QString& contact )
+TQString Oscar::normalize( const TQString& contact )
{
- QString normal = contact.lower();
+ TQString normal = contact.lower();
normal.remove( ' ' );
return normal;
}
@@ -39,10 +39,10 @@ bool Oscar::operator==( TLV a, TLV b )
return false;
}
-TLV Oscar::findTLV( const QValueList<TLV>& list, int type )
+TLV Oscar::findTLV( const TQValueList<TLV>& list, int type )
{
TLV t;
- QValueList<TLV>::const_iterator it;
+ TQValueList<TLV>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it )
{
if ( ( *it ).type == type )
@@ -52,12 +52,12 @@ TLV Oscar::findTLV( const QValueList<TLV>& list, int type )
return t;
}
-bool Oscar::uptateTLVs( SSI& item, const QValueList<TLV>& list )
+bool Oscar::uptateTLVs( SSI& item, const TQValueList<TLV>& list )
{
bool changed = false;
- QValueList<TLV> tList( item.tlvList() );
+ TQValueList<TLV> tList( item.tlvList() );
- QValueList<TLV>::const_iterator it;
+ TQValueList<TLV>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it )
{
TLV t = Oscar::findTLV( tList, ( *it ).type );
@@ -92,9 +92,9 @@ int Oscar::parseCap( char* cap )
return capflag;
}
-const QString Oscar::capToString( char* cap )
+const TQString Oscar::capToString( char* cap )
{
- QString dbg;
+ TQString dbg;
dbg.sprintf( "{%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
cap[0], cap[1], cap[2], cap[3], cap[4], cap[5], cap[6], cap[7], cap[8], cap[9],
@@ -103,17 +103,17 @@ const QString Oscar::capToString( char* cap )
return dbg;
}
-DWORD Oscar::parseCapabilities( Buffer &inbuf, QString &versionString )
+DWORD Oscar::parseCapabilities( Buffer &inbuf, TQString &versionString )
{
//
// FIXME: port capabilities array to some qt based list class, makes usage of memcmp obsolete
//
DWORD capflags = 0;
- QString dbgCaps = "CAPS: ";
+ TQString dbgCaps = "CAPS: ";
while(inbuf.length() >= 16)
{
- QByteArray cap;
+ TQByteArray cap;
cap.duplicate( inbuf.getBlock(16) );
for (int i=0; i < CAP_LAST; i++)
@@ -184,9 +184,9 @@ DWORD Oscar::parseCapabilities( Buffer &inbuf, QString &versionString )
return capflags;
}
-const QString Oscar::capName( int capNumber )
+const TQString Oscar::capName( int capNumber )
{
- QString capString;
+ TQString capString;
switch ( capNumber )
{
@@ -279,18 +279,18 @@ const QString Oscar::capName( int capNumber )
return capString;
}
-DWORD Oscar::getNumericalIP(const QString &address)
+DWORD Oscar::getNumericalIP(const TQString &address)
{
- QHostAddress addr;
+ TQHostAddress addr;
if ( addr.setAddress( address ) == false )
return 0;
return (DWORD)addr.toIPv4Address();
}
-QString Oscar::getDottedDecimal( DWORD address )
+TQString Oscar::getDottedDecimal( DWORD address )
{
- QHostAddress addr;
+ TQHostAddress addr;
addr.setAddress((Q_UINT32)address);
return addr.toString();
}
diff --git a/kopete/protocols/oscar/liboscar/oscarutils.h b/kopete/protocols/oscar/liboscar/oscarutils.h
index bf8b5aba..a9cd921c 100644
--- a/kopete/protocols/oscar/liboscar/oscarutils.h
+++ b/kopete/protocols/oscar/liboscar/oscarutils.h
@@ -19,9 +19,9 @@
#ifndef _OSCARUTILS_H_
#define _OSCARUTILS_H_
-#include <qglobal.h>
-#include <qvaluelist.h>
-#include <qstring.h>
+#include <tqglobal.h>
+#include <tqvaluelist.h>
+#include <tqstring.h>
#include "oscartypes.h"
#include "buffer.h"
@@ -29,7 +29,7 @@ namespace Oscar
{
///Normalize the contact name to all lowercase and no spaces
-KOPETE_EXPORT QString normalize( const QString& );
+KOPETE_EXPORT TQString normalize( const TQString& );
///compare TLVs for equality
KOPETE_EXPORT bool operator==( TLV, TLV );
@@ -37,13 +37,13 @@ KOPETE_EXPORT bool operator==( TLV, TLV );
/**
* Find the TLV corresponding to the type in the list
*/
-KOPETE_EXPORT TLV findTLV( const QValueList<TLV>&, int type );
+KOPETE_EXPORT TLV findTLV( const TQValueList<TLV>&, int type );
/**
* Update TLVs of SSI item from TLV list if necessary
* \return true if something was updated
*/
-KOPETE_EXPORT bool uptateTLVs( SSI& item, const QValueList<TLV>& list );
+KOPETE_EXPORT bool uptateTLVs( SSI& item, const TQValueList<TLV>& list );
/**
* Get the value of the capability that corresponds to the value
@@ -57,34 +57,34 @@ int parseCap( char* cap );
/**
* Convert the capability to a string we can print
*/
-const QString capToString(char *cap);
+const TQString capToString(char *cap);
/**
* Parse the character array for validness and a version string
* \param buffer the buffer we'll be parsing for capabilities
- * \param versionString a QString reference that will contain the
- * version string of the detected client. Will be QString::null if
+ * \param versionString a TQString reference that will contain the
+ * version string of the detected client. Will be TQString::null if
* no client is found
* \return a DWORD containg a bit array of the capabilities we found
*/
-DWORD parseCapabilities(Buffer &inbuf, QString &versionString);
+DWORD parseCapabilities(Buffer &inbuf, TQString &versionString);
/**
* Get the name of the capability from its number
*/
-const QString capName( int capNumber );
+const TQString capName( int capNumber );
/**
* Convert an IP address in dotted decimal notation to a
* numerical constant
*/
-DWORD getNumericalIP( const QString& address );
+DWORD getNumericalIP( const TQString& address );
/**
* Convert a numerical constant that is an IP address to
* dotted decimal format
*/
-QString getDottedDecimal( DWORD address );
+TQString getDottedDecimal( DWORD address );
}
diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp
index a1baf073..2cf57d53 100644
--- a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp
@@ -16,7 +16,7 @@
*************************************************************************
*/
#include "ownuserinfotask.h"
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdebug.h>
#include "buffer.h"
#include "connection.h"
@@ -70,7 +70,7 @@ bool OwnUserInfoTask::take( Transfer* transfer )
ud.fill( b );
m_details = ud;
emit gotInfo();
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return true;
}
else
@@ -83,7 +83,7 @@ bool OwnUserInfoTask::take( Transfer* transfer )
if ( flags == 0x41 ) //we need to do a buddy upload when bit 8 = 1
needUpload = true;
- QByteArray qba;
+ TQByteArray qba;
if ( b->length() != 0 )
{ //buffer might be empty if flags bit 8 = 1
BYTE checksumLength = b->getByte();
@@ -104,11 +104,11 @@ bool OwnUserInfoTask::take( Transfer* transfer )
if ( infoType == 0x0002 )
{
- QString availableMsg( b->getBSTR() );
+ TQString availableMsg( b->getBSTR() );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "self available message: " << endl;
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return true;
}
diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
index 30a169db..35314df0 100644
--- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
@@ -44,9 +44,9 @@ signals:
/** Emitted when user info is recieved. Needed because succeeded() is only emitted once. */
void gotInfo();
- void haveAvailableMessage( const QString& );
+ void haveAvailableMessage( const TQString& );
- void haveIconChecksum( const QString& );
+ void haveIconChecksum( const TQString& );
void buddyIconUploadRequested();
diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.cpp b/kopete/protocols/oscar/liboscar/prmparamstask.cpp
index 3668c73b..43580206 100644
--- a/kopete/protocols/oscar/liboscar/prmparamstask.cpp
+++ b/kopete/protocols/oscar/liboscar/prmparamstask.cpp
@@ -52,7 +52,7 @@ bool PRMParamsTask::take( Transfer* transfer )
if ( forMe( transfer ) )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Ignoring PRM Parameters. We don't use them" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return true;
}
diff --git a/kopete/protocols/oscar/liboscar/profiletask.cpp b/kopete/protocols/oscar/liboscar/profiletask.cpp
index d64d5dbe..4b0949ea 100644
--- a/kopete/protocols/oscar/liboscar/profiletask.cpp
+++ b/kopete/protocols/oscar/liboscar/profiletask.cpp
@@ -18,7 +18,7 @@
#include "profiletask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "transfer.h"
@@ -56,12 +56,12 @@ void ProfileTask::onGo()
sendProfileUpdate();
}
-void ProfileTask::setProfileText( const QString& text )
+void ProfileTask::setProfileText( const TQString& text )
{
m_profileText = text;
}
-void ProfileTask::setAwayMessage( const QString& text )
+void ProfileTask::setAwayMessage( const TQString& text )
{
m_awayMessage = text;
}
@@ -76,7 +76,7 @@ void ProfileTask::sendProfileUpdate()
if ( !m_profileText.isNull() && !client()->isIcq() )
{
- static const QString defencoding = "text/aolrtf; charset=\"us-ascii\"";
+ static const TQString defencoding = "text/aolrtf; charset=\"us-ascii\"";
buffer->addTLV(0x0001, defencoding.length(), defencoding.latin1());
buffer->addTLV(0x0002, m_profileText.length(), m_profileText.local8Bit());
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting profile = " << m_profileText << endl;
@@ -84,7 +84,7 @@ void ProfileTask::sendProfileUpdate()
if ( !m_awayMessage.isNull() && !client()->isIcq() )
{
- static const QString defencoding = "text/aolrtf; charset=\"us-ascii\"";
+ static const TQString defencoding = "text/aolrtf; charset=\"us-ascii\"";
buffer->addTLV(0x0003, defencoding.length(), defencoding.latin1());
buffer->addTLV(0x0004, m_awayMessage.length(), m_awayMessage.local8Bit());
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting away message = " << m_awayMessage << endl;
@@ -112,7 +112,7 @@ void ProfileTask::sendProfileUpdate()
buffer->addTLV(0x0005, capBuf.length(), capBuf.buffer());
Transfer* st = createTransfer( f, s , buffer );
send( st );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
diff --git a/kopete/protocols/oscar/liboscar/profiletask.h b/kopete/protocols/oscar/liboscar/profiletask.h
index 23555105..a51075a5 100644
--- a/kopete/protocols/oscar/liboscar/profiletask.h
+++ b/kopete/protocols/oscar/liboscar/profiletask.h
@@ -39,16 +39,16 @@ public:
bool take( Transfer* transfer );
void onGo();
- void setProfileText( const QString& text );
- void setAwayMessage( const QString& text );
+ void setProfileText( const TQString& text );
+ void setAwayMessage( const TQString& text );
private:
void sendProfileUpdate();
private:
- QString m_profileText;
- QString m_awayMessage;
+ TQString m_profileText;
+ TQString m_awayMessage;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp
index 7fee4239..d035c810 100644
--- a/kopete/protocols/oscar/liboscar/rateclass.cpp
+++ b/kopete/protocols/oscar/liboscar/rateclass.cpp
@@ -16,14 +16,14 @@
*/
#include "rateclass.h"
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdebug.h>
#include "transfer.h"
using namespace Oscar;
-RateClass::RateClass( QObject* parent )
-: QObject( parent, 0 )
+RateClass::RateClass( TQObject* parent )
+: TQObject( parent, 0 )
{
m_waitingToSend = false;
m_packetTimer.start();
@@ -70,8 +70,8 @@ void RateClass::addMember( WORD family, WORD subtype )
bool RateClass::isMember(const SNAC &s) const
{
- QValueList<SnacPair>::const_iterator it;
- QValueList<SnacPair>::const_iterator spEnd = m_members.constEnd();
+ TQValueList<SnacPair>::const_iterator it;
+ TQValueList<SnacPair>::const_iterator spEnd = m_members.constEnd();
for ( it = m_members.constBegin(); it != spEnd; ++it )
{
if ( ( *it ).family == s.family && ( *it ).subtype == s.subtype )
@@ -83,8 +83,8 @@ bool RateClass::isMember(const SNAC &s) const
bool RateClass::isMember( WORD family, WORD subtype ) const
{
- QValueList<SnacPair>::const_iterator it;
- QValueList<SnacPair>::const_iterator spEnd = m_members.constEnd();
+ TQValueList<SnacPair>::const_iterator it;
+ TQValueList<SnacPair>::const_iterator spEnd = m_members.constEnd();
for ( it = m_members.constBegin(); it != spEnd; ++it )
{
if ( ( *it ).family == family && ( *it ).subtype == subtype )
@@ -194,7 +194,7 @@ void RateClass::setupTimer()
}
else
{
- QTimer::singleShot( ttns, this, SLOT( slotSend() ) ); //or send later
+ TQTimer::singleShot( ttns, this, TQT_SLOT( slotSend() ) ); //or send later
}
}
}
@@ -232,7 +232,7 @@ void RateClass::updateRateInfo()
void RateClass::dumpQueue()
{
- QValueList<Transfer*>::iterator it = m_packetQueue.begin();
+ TQValueList<Transfer*>::iterator it = m_packetQueue.begin();
while ( it != m_packetQueue.end() && m_packetQueue.count() > 0 )
{
Transfer* t = ( *it );
diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h
index 1bb86f03..78ad8917 100644
--- a/kopete/protocols/oscar/liboscar/rateclass.h
+++ b/kopete/protocols/oscar/liboscar/rateclass.h
@@ -19,10 +19,10 @@
#define RATECLASS_H
#include "oscartypes.h"
-#include <qobject.h>
-#include <qvaluelist.h>
-#include <qdatetime.h>
-#include <qpair.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
+#include <tqdatetime.h>
+#include <tqpair.h>
const int RATE_SAFETY_TIME = 50;
@@ -38,7 +38,7 @@ class RateClass : public QObject
{
Q_OBJECT
public:
- RateClass( QObject* parent = 0 );
+ RateClass( TQObject* parent = 0 );
~RateClass();
/** Accessor for classid */
@@ -119,11 +119,11 @@ private slots:
private:
Oscar::RateInfo m_rateInfo;
- QValueList<SnacPair> m_members;
- QValueList<Transfer*> m_packetQueue;
- QTime m_packetTimer;
+ TQValueList<SnacPair> m_members;
+ TQValueList<Transfer*> m_packetQueue;
+ TQTime m_packetTimer;
- // we are waiting for the QTimer::singleShot() to send
+ // we are waiting for the TQTimer::singleShot() to send
bool m_waitingToSend;
};
diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp
index 8b306c0b..59ef735e 100644
--- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp
+++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp
@@ -16,7 +16,7 @@
*************************************************************************
*/
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
@@ -30,12 +30,12 @@ class RateClassManagerPrivate
{
public:
//! The list of rate classes owned by this manager
- QValueList<RateClass*> classList;
+ TQValueList<RateClass*> classList;
Connection* client;
};
RateClassManager::RateClassManager( Connection* parent, const char* name )
-: QObject( parent, name )
+: TQObject( parent, name )
{
d = new RateClassManagerPrivate();
d->client = parent;
@@ -49,7 +49,7 @@ RateClassManager::~RateClassManager()
void RateClassManager::reset()
{
- QValueList<RateClass*>::iterator it = d->classList.begin();
+ TQValueList<RateClass*>::iterator it = d->classList.begin();
while ( it != d->classList.end() && d->classList.count() > 0)
{
RateClass* rc = ( *it );
@@ -60,7 +60,7 @@ void RateClassManager::reset()
void RateClassManager::registerClass( RateClass* rc )
{
- QObject::connect( rc, SIGNAL( dataReady( Transfer* ) ), this, SLOT( transferReady( Transfer* ) ) );
+ TQObject::connect( rc, TQT_SIGNAL( dataReady( Transfer* ) ), this, TQT_SLOT( transferReady( Transfer* ) ) );
d->classList.append( rc );
}
@@ -110,7 +110,7 @@ void RateClassManager::queue( Transfer* t )
transferReady( t );
}
-QValueList<RateClass*> RateClassManager::classList() const
+TQValueList<RateClass*> RateClassManager::classList() const
{
return d->classList;
}
@@ -133,8 +133,8 @@ RateClass* RateClassManager::findRateClass( SnacTransfer* st ) const
SNAC s = st->snac();
//kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Looking for SNAC " << s.family << ", " << s.subtype << endl;
RateClass* rc = 0L;
- QValueList<RateClass*>::const_iterator it;
- QValueList<RateClass*>::const_iterator rcEnd = d->classList.constEnd();
+ TQValueList<RateClass*>::const_iterator it;
+ TQValueList<RateClass*>::const_iterator rcEnd = d->classList.constEnd();
for ( it = d->classList.constBegin(); it != rcEnd; ++it )
{
@@ -151,16 +151,16 @@ RateClass* RateClassManager::findRateClass( SnacTransfer* st ) const
void RateClassManager::recalcRateLevels()
{
- QValueList<RateClass*>::iterator it;
- QValueList<RateClass*>::iterator rcEnd = d->classList.end();
+ TQValueList<RateClass*>::iterator it;
+ TQValueList<RateClass*>::iterator rcEnd = d->classList.end();
for ( it = d->classList.begin(); it != rcEnd; ++it )
( *it )->updateRateInfo();
}
int RateClassManager::timeToInitialLevel( SNAC s )
{
- QValueList<RateClass*>::const_iterator it;
- QValueList<RateClass*>::const_iterator rcEnd = d->classList.constEnd();
+ TQValueList<RateClass*>::const_iterator it;
+ TQValueList<RateClass*>::const_iterator rcEnd = d->classList.constEnd();
for ( it = d->classList.constBegin(); it != rcEnd; ++it )
{
diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h
index 4b972ede..b1240f07 100644
--- a/kopete/protocols/oscar/liboscar/rateclassmanager.h
+++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h
@@ -19,9 +19,9 @@
#ifndef RATECLASSMANAGER_H
#define RATECLASSMANAGER_H
-#include <qobject.h>
-#include <qvaluelist.h>
-#include <qmap.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
+#include <tqmap.h>
#include "oscartypes.h"
class Transfer;
@@ -51,7 +51,7 @@ public:
void queue( Transfer* t );
/** Get the list of rate classes */
- QValueList<RateClass*> classList() const;
+ TQValueList<RateClass*> classList() const;
/** Recalculate the rate levels for all the classes */
void recalcRateLevels();
diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp
index f19cf792..08002b8a 100644
--- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp
@@ -18,7 +18,7 @@
#include "rateinfotask.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdebug.h>
#include "rateclass.h"
#include "rateclassmanager.h"
@@ -32,7 +32,7 @@ using namespace Oscar;
RateInfoTask::RateInfoTask( Task* parent )
: Task( parent )
{
- connect( this, SIGNAL( gotRateLimits() ), this, SLOT( sendRateInfoAck() ) );
+ connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) );
}
@@ -80,7 +80,7 @@ void RateInfoTask::sendRateInfoRequest()
void RateInfoTask::handleRateInfoResponse()
{
- QValueList<RateClass*> rates;
+ TQValueList<RateClass*> rates;
Oscar::RateInfo ri;
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "handling rate info response (SNAC 0x01, 0x07)" << endl;
@@ -119,7 +119,7 @@ void RateInfoTask::handleRateInfoResponse()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding snac members to group " << groupNum << endl;
RateClass* rc = 0L;
- QValueList<RateClass*>::iterator it = rates.begin();
+ TQValueList<RateClass*>::iterator it = rates.begin();
for ( ; it != rates.end(); ++it )
{
if ( ( *it )->id() == groupNum )
@@ -139,8 +139,8 @@ void RateInfoTask::handleRateInfoResponse()
}
}
- QValueList<RateClass*>::iterator it = rates.begin();
- QValueList<RateClass*>::iterator rcEnd = rates.end();
+ TQValueList<RateClass*>::iterator it = rates.begin();
+ TQValueList<RateClass*>::iterator rcEnd = rates.end();
for ( ; it != rcEnd; ++it )
client()->rateManager()->registerClass( ( *it ) );
@@ -154,8 +154,8 @@ void RateInfoTask::sendRateInfoAck()
SNAC s = { 0x0001, 0x0008, 0x0000, client()->snacSequence() };
Buffer* buffer = new Buffer();
- QValueListConstIterator<int> cit = m_rateGroups.begin();
- QValueListConstIterator<int> end = m_rateGroups.end();
+ TQValueListConstIterator<int> cit = m_rateGroups.begin();
+ TQValueListConstIterator<int> end = m_rateGroups.end();
for ( cit = m_rateGroups.begin(); cit != end; ++cit )
{
//kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding rate " << (*cit) << " to rate ack" << endl;
@@ -164,7 +164,7 @@ void RateInfoTask::sendRateInfoAck()
Transfer* st = createTransfer( f, s, buffer );
send( st );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
#include "rateinfotask.moc"
diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h
index 3964f0ea..013559f6 100644
--- a/kopete/protocols/oscar/liboscar/rateinfotask.h
+++ b/kopete/protocols/oscar/liboscar/rateinfotask.h
@@ -20,7 +20,7 @@
#define RATEINFOTASK_H
#include "task.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
using namespace Oscar;
@@ -56,7 +56,7 @@ private slots:
private:
bool m_needRateAck;
- QValueList<int> m_rateGroups;
+ TQValueList<int> m_rateGroups;
};
//kate: tab-width 4; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc
index bb4d88ee..39c16bc4 100644
--- a/kopete/protocols/oscar/liboscar/rtf.cc
+++ b/kopete/protocols/oscar/liboscar/rtf.cc
@@ -1627,25 +1627,25 @@ void ParStyle::clearFormatting()
// dir is not a formatting item.
}
-QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
+TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode)
{
- QString str = _str;
- str.replace(QRegExp("&"), "&amp;");
- str.replace(QRegExp("<"), "&lt;");
- str.replace(QRegExp(">"), "&gt;");
- str.replace(QRegExp("\""), "&quot;");
- str.replace(QRegExp("\r"), "");
+ TQString str = _str;
+ str.replace(TQRegExp("&"), "&amp;");
+ str.replace(TQRegExp("<"), "&lt;");
+ str.replace(TQRegExp(">"), "&gt;");
+ str.replace(TQRegExp("\""), "&quot;");
+ str.replace(TQRegExp("\r"), "");
switch (mode){
case quoteHTML:
- str.replace(QRegExp("\n"), "<br>\n");
+ str.replace(TQRegExp("\n"), "<br>\n");
break;
case quoteXML:
- str.replace(QRegExp("\n"), "<br/>\n");
+ str.replace(TQRegExp("\n"), "<br/>\n");
break;
default:
break;
}
- QRegExp re(" +");
+ TQRegExp re(" +");
int len;
int pos = 0;
@@ -1654,7 +1654,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode)
if (len == 1)
continue;
- QString s = " ";
+ TQString s = " ";
for (int i = 1; i < len; i++)
s += "&nbsp;";
str.replace(pos, len, s);
@@ -1690,7 +1690,7 @@ void RTF2HTML::FlushOutTags()
// RTF colors are 1-based; colors[] is a 0-based array.
if (t.param > colors.size() || t.param == 0)
break;
- QColor &c = colors[t.param-1];
+ TQColor &c = colors[t.param-1];
PrintUnquoted("<span style=\"color:#%02X%02X%02X\">", c.red(), c.green(), c.blue());
}
break;
@@ -1707,7 +1707,7 @@ void RTF2HTML::FlushOutTags()
case TAG_BG_COLOR:{
if (t.param > colors.size())
break;
- QColor &c = colors[t.param];
+ TQColor &c = colors[t.param];
PrintUnquoted("<span style=\"background-color:#%02X%02X%02X;\">", c.red(), c.green(), c.blue());
break;
}
@@ -1878,7 +1878,7 @@ void RTF2HTML::PrintUnquoted(const char *str, ...)
sParagraph += buff;
}
-void RTF2HTML::PrintQuoted(const QString &str)
+void RTF2HTML::PrintQuoted(const TQString &str)
{
sParagraph += quoteString(str);
}
@@ -2110,7 +2110,7 @@ void Level::reset()
resetTag(TAG_ALL);
if (m_bColors){
if (m_bColorInit){
- QColor c(m_nRed, m_nGreen, m_nBlue);
+ TQColor c(m_nRed, m_nGreen, m_nBlue);
p->colors.push_back(c);
resetColors();
}
@@ -2181,7 +2181,7 @@ void Level::flush()
if (encoding == NULL)
encoding = p->encoding;
- QTextCodec *codec = ICQClient::_getCodec(encoding);
+ TQTextCodec *codec = ICQClient::_getCodec(encoding);
*/
//p->PrintQuoted(codec->toUnicode(text.c_str(), text.length()));
p->PrintQuoted(text.c_str());
@@ -2245,7 +2245,7 @@ static char h2d(char c)
return 0;
}
-QString RTF2HTML::Parse(const char *rtf, const char *_encoding)
+TQString RTF2HTML::Parse(const char *rtf, const char *_encoding)
{
encoding = _encoding;
YY_BUFFER_STATE yy_current_buffer = yy_scan_string(rtf);
@@ -2313,7 +2313,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding)
break;
case UNICODE_CHAR:{
cur_level.flush();
- sParagraph += QChar((unsigned short)(atol(yytext + 2)));
+ sParagraph += TQChar((unsigned short)(atol(yytext + 2)));
break;
}
case HEX:{
@@ -2412,7 +2412,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding)
}
/*
-bool ICQClient::parseRTF(const char *rtf, const char *encoding, QString &res)
+bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res)
{
char _RTF[] = "{\\rtf";
if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){
@@ -2420,7 +2420,7 @@ bool ICQClient::parseRTF(const char *rtf, const char *encoding, QString &res)
res = p.Parse(rtf, encoding);
return true;
}
- QTextCodec *codec = ICQClient::_getCodec(encoding);
+ TQTextCodec *codec = ICQClient::_getCodec(encoding);
res = codec->toUnicode(rtf, strlen(rtf));
return false;
}
diff --git a/kopete/protocols/oscar/liboscar/rtf2html.h b/kopete/protocols/oscar/liboscar/rtf2html.h
index a305b89d..5685e4a1 100644
--- a/kopete/protocols/oscar/liboscar/rtf2html.h
+++ b/kopete/protocols/oscar/liboscar/rtf2html.h
@@ -18,12 +18,12 @@
#ifndef RTF2HTML_H
#define RTF2HTML_H
-#include <qstring.h>
+#include <tqstring.h>
#include <stdio.h>
-#include <qtextcodec.h>
-#include <qcolor.h>
-#include <qregexp.h>
+#include <tqtextcodec.h>
+#include <tqcolor.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <vector>
@@ -149,15 +149,15 @@ class RTF2HTML
public:
RTF2HTML();
- QString Parse(const char *rtf, const char *encoding);
+ TQString Parse(const char *rtf, const char *encoding);
// Paragraph-specific functions:
- QString quoteString(const QString &_str, quoteMode mode = quoteHTML);
+ TQString quoteString(const TQString &_str, quoteMode mode = quoteHTML);
// Appends a string with formatting into the paragraph buffer.
void PrintUnquoted(const char *str, ...);
// Quotes and appends a string to the paragraph buffer.
- void PrintQuoted(const QString &str);
+ void PrintQuoted(const TQString &str);
// Writes down the tags from oTags into the paragraph buffer.
void FlushOutTags();
// Retrieves the top not-yet-written tag.
@@ -179,7 +179,7 @@ protected:
// True if the paragraph was opened explicitly.
bool bExplicitParagraph;
// The paragraph's HTML buffer.
- QString sParagraph;
+ TQString sParagraph;
// Defines the paragraph's formatting.
ParStyle parStyle;
// Tags which weren't yet printed out.
@@ -188,11 +188,11 @@ protected:
// Document members
// The document HTML buffer.
- QString s;
+ TQString s;
// Fonts table.
vector<FontDef> fonts;
// Colors table.
- vector<QColor> colors;
+ vector<TQColor> colors;
// Stack of tags (across all levels, not just current level)
stack<TagEnum> tags;
diff --git a/kopete/protocols/oscar/liboscar/safedelete.cpp b/kopete/protocols/oscar/liboscar/safedelete.cpp
index 703e8ed3..5dde3725 100644
--- a/kopete/protocols/oscar/liboscar/safedelete.cpp
+++ b/kopete/protocols/oscar/liboscar/safedelete.cpp
@@ -19,7 +19,7 @@
#include "safedelete.h"
-#include <qtimer.h>
+#include <tqtimer.h>
//----------------------------------------------------------------------------
// SafeDelete
@@ -35,7 +35,7 @@ SafeDelete::~SafeDelete()
lock->dying();
}
-void SafeDelete::deleteLater(QObject *o)
+void SafeDelete::deleteLater(TQObject *o)
{
if(!lock)
deleteSingle(o);
@@ -54,16 +54,16 @@ void SafeDelete::deleteAll()
if(list.isEmpty())
return;
- QObjectListIt it(list);
- for(QObject *o; (o = it.current()); ++it)
+ TQObjectListIt it(list);
+ for(TQObject *o; (o = it.current()); ++it)
deleteSingle(o);
list.clear();
}
-void SafeDelete::deleteSingle(QObject *o)
+void SafeDelete::deleteSingle(TQObject *o)
{
#if QT_VERSION < 0x030000
- // roll our own QObject::deleteLater()
+ // roll our own TQObject::deleteLater()
SafeDeleteLater *sdl = SafeDeleteLater::ensureExists();
sdl->deleteItLater(o);
#else
@@ -116,7 +116,7 @@ SafeDeleteLater::SafeDeleteLater()
{
list.setAutoDelete(true);
self = this;
- QTimer::singleShot(0, this, SLOT(explode()));
+ TQTimer::singleShot(0, this, TQT_SLOT(explode()));
}
SafeDeleteLater::~SafeDeleteLater()
@@ -125,7 +125,7 @@ SafeDeleteLater::~SafeDeleteLater()
self = 0;
}
-void SafeDeleteLater::deleteItLater(QObject *o)
+void SafeDeleteLater::deleteItLater(TQObject *o)
{
list.append(o);
}
diff --git a/kopete/protocols/oscar/liboscar/safedelete.h b/kopete/protocols/oscar/liboscar/safedelete.h
index e8215c06..0d4150d9 100644
--- a/kopete/protocols/oscar/liboscar/safedelete.h
+++ b/kopete/protocols/oscar/liboscar/safedelete.h
@@ -20,8 +20,8 @@
#ifndef SAFEDELETE_H
#define SAFEDELETE_H
-#include<qobject.h>
-#include<qobjectlist.h>
+#include<tqobject.h>
+#include<tqobjectlist.h>
class SafeDelete;
class SafeDeleteLock
@@ -43,13 +43,13 @@ public:
SafeDelete();
~SafeDelete();
- void deleteLater(QObject *o);
+ void deleteLater(TQObject *o);
- // same as QObject::deleteLater()
- static void deleteSingle(QObject *o);
+ // same as TQObject::deleteLater()
+ static void deleteSingle(TQObject *o);
private:
- QObjectList list;
+ TQObjectList list;
void deleteAll();
friend class SafeDeleteLock;
@@ -62,7 +62,7 @@ class SafeDeleteLater : public QObject
Q_OBJECT
public:
static SafeDeleteLater *ensureExists();
- void deleteItLater(QObject *o);
+ void deleteItLater(TQObject *o);
private slots:
void explode();
@@ -71,7 +71,7 @@ private:
SafeDeleteLater();
~SafeDeleteLater();
- QObjectList list;
+ TQObjectList list;
friend class SafeDelete;
static SafeDeleteLater *self;
};
diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
index af80e191..2b5dbbae 100644
--- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
@@ -100,7 +100,7 @@ void SendDCInfoTask::onGo()
Transfer* t = createTransfer( f, s, buffer );
send( t );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp
index f0601e22..ba753471 100644
--- a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp
@@ -45,7 +45,7 @@ void SendIdleTimeTask::onGo()
Transfer *t = createTransfer( f, s, buffer );
send( t );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index 48509595..1b8cbfbc 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -344,13 +344,13 @@ void SendMessageTask::addRendezvousMessageData( Buffer* b )
/* Old oscarsocket code, which is here for reference in case this doesn't work
-QTextCodec *codec = 0L;
+TQTextCodec *codec = 0L;
WORD charset = 0x0000; // default to ascii
WORD charsubset = 0x0000;
int length = message.length();
unsigned char *utfMessage = 0L;
-codec=QTextCodec::codecForMib(3); // US-ASCII
+codec=TQTextCodec::codecForMib(3); // US-ASCII
if(codec)
{
@@ -360,7 +360,7 @@ if(codec)
// We are forcing kopete to send messages using ISO-8859-1
// It's a hack and should be reimplemented in a better way
charset=0x0003;
- codec=QTextCodec::codecForMib(4);
+ codec=TQTextCodec::codecForMib(4);
//kdDebug(14151) << k_funcinfo << "Now trying ISO-8859-1" << endl;
}
else
@@ -388,7 +388,7 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) )
// no codec and no charset and per-contact encoding set
if(!codec && charset != 0x0002 && contact->encoding() != 0)
{
- codec=QTextCodec::codecForMib(contact->encoding());
+ codec=TQTextCodec::codecForMib(contact->encoding());
if(codec)
charset=0x0003; //send as ISO-8859-1
}
@@ -399,7 +399,7 @@ if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec
"Couldn't find suitable encoding for outgoing message, " <<
"encoding using ISO-8859-1, prepare for receiver getting unreadable text :)" << endl;
charset=0x0003;
- codec=QTextCodec::codecForMib(4); // ISO-8859-1
+ codec=TQTextCodec::codecForMib(4); // ISO-8859-1
}
tlv2.addWord(0x0101); //add TLV(0x0101) also known as TLV(257)
@@ -416,7 +416,7 @@ if(utfMessage)
else
{
kdDebug(14151) << k_funcinfo << "Outgoing message encoded as '" << codec->name() << "'" << endl;
- QCString outgoingMessage=codec->fromUnicode(message);
+ TQCString outgoingMessage=codec->fromUnicode(message);
tlv2.addString(outgoingMessage, length); // the actual message
}
// ====================================================================================
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.h b/kopete/protocols/oscar/liboscar/sendmessagetask.h
index 0eaff13f..18e03c73 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.h
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.h
@@ -18,7 +18,7 @@
#define SENDMESSAGETASK_H
#include "task.h"
-#include <qstring.h>
+#include <tqstring.h>
#include "oscarmessage.h"
/**
@author Kopete Developers
diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp
index 32cb105f..5875e6a8 100644
--- a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp
+++ b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp
@@ -36,7 +36,7 @@ void ServerRedirectTask::setService( WORD family )
m_service = family;
}
-void ServerRedirectTask::setChatParams( WORD exchange, QByteArray cookie, WORD instance )
+void ServerRedirectTask::setChatParams( WORD exchange, TQByteArray cookie, WORD instance )
{
m_chatExchange = exchange;
m_chatCookie.duplicate( cookie );
@@ -44,7 +44,7 @@ void ServerRedirectTask::setChatParams( WORD exchange, QByteArray cookie, WORD i
m_chatInstance = instance;
}
-void ServerRedirectTask::setChatRoom( const QString& roomName )
+void ServerRedirectTask::setChatRoom( const TQString& roomName )
{
m_chatRoom = roomName;
}
@@ -75,7 +75,7 @@ bool ServerRedirectTask::take( Transfer* transfer )
setTransfer( transfer );
bool value = handleRedirect();
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return value;
}
@@ -126,7 +126,7 @@ bool ServerRedirectTask::handleRedirect()
return false;
TLV server = b->getTLV();
- m_newHost = QString( server.data );
+ m_newHost = TQString( server.data );
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Host for service " << m_service
<< " is " << m_newHost << endl;
if ( m_newHost.isEmpty() )
@@ -143,12 +143,12 @@ bool ServerRedirectTask::handleRedirect()
return true;
}
-QByteArray ServerRedirectTask::cookie() const
+TQByteArray ServerRedirectTask::cookie() const
{
return m_cookie;
}
-QString ServerRedirectTask::newHost() const
+TQString ServerRedirectTask::newHost() const
{
return m_newHost;
}
@@ -163,7 +163,7 @@ WORD ServerRedirectTask::chatExchange() const
return m_chatExchange;
}
-QString ServerRedirectTask::chatRoomName() const
+TQString ServerRedirectTask::chatRoomName() const
{
return m_chatRoom;
}
diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h
index 785ac0df..972e28ce 100644
--- a/kopete/protocols/oscar/liboscar/serverredirecttask.h
+++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h
@@ -23,7 +23,7 @@
#include "task.h"
-#include <qcstring.h>
+#include <tqcstring.h>
#include "oscartypes.h"
@@ -36,11 +36,11 @@ public:
ServerRedirectTask( Task* parent );
void setService( WORD family );
- void setChatParams( WORD exchange, QByteArray cookie, WORD instance );
- void setChatRoom( const QString& roomName );
+ void setChatParams( WORD exchange, TQByteArray cookie, WORD instance );
+ void setChatRoom( const TQString& roomName );
WORD chatExchange() const;
- QString chatRoomName() const;
+ TQString chatRoomName() const;
//Task implementation
void onGo();
@@ -50,22 +50,22 @@ public:
void requestNewService();
bool handleRedirect();
- QByteArray cookie() const;
- QString newHost() const;
+ TQByteArray cookie() const;
+ TQString newHost() const;
WORD service() const;
signals:
- void haveServer( const QString&, const QByteArray&, WORD );
+ void haveServer( const TQString&, const TQByteArray&, WORD );
private:
WORD m_service;
- QString m_newHost;
- QByteArray m_cookie;
+ TQString m_newHost;
+ TQByteArray m_cookie;
WORD m_chatExchange;
- QByteArray m_chatCookie;
+ TQByteArray m_chatCookie;
WORD m_chatInstance;
- QString m_chatRoom;
+ TQString m_chatRoom;
};
diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.cpp b/kopete/protocols/oscar/liboscar/serverversionstask.cpp
index e4186f18..b2e7dfa6 100644
--- a/kopete/protocols/oscar/liboscar/serverversionstask.cpp
+++ b/kopete/protocols/oscar/liboscar/serverversionstask.cpp
@@ -101,7 +101,7 @@ void ServerVersionsTask::handleFamilies()
Buffer* outbuf = transfer()->buffer();
if ( outbuf->length() % 2 != 0 )
{
- setError( -1, QString::null );
+ setError( -1, TQString::null );
return;
}
@@ -163,7 +163,7 @@ void ServerVersionsTask::handleServerVersions()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "server version=" << buffer->getWord()
<< ", server family=" << buffer->getWord() << endl;
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
#include "serverversionstask.moc"
diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h
index a9c56f35..f3a72a38 100644
--- a/kopete/protocols/oscar/liboscar/serverversionstask.h
+++ b/kopete/protocols/oscar/liboscar/serverversionstask.h
@@ -20,7 +20,7 @@
#define SERVERVERSIONSTASK_H
#include "task.h"
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include "oscartypes.h"
class Transfer;
@@ -52,7 +52,7 @@ private:
void requestFamilyVersions();
private:
- QValueList<int> m_familiesList;
+ TQValueList<int> m_familiesList;
WORD m_family;
};
diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp
index 13e30101..61f53279 100644
--- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp
+++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp
@@ -47,14 +47,14 @@ ServiceSetupTask::ServiceSetupTask( Task* parent )
m_ssiListTask = new SSIListTask( parent );
m_ssiActivateTask = new SSIActivateTask( parent );
- QObject::connect( m_ssiListTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_ssiParamTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_prmTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_icbmTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_blmLimitsTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_profileTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_locRightsTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
- QObject::connect( m_ssiActivateTask, SIGNAL( finished() ), this, SLOT( childTaskFinished() ) );
+ TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_prmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_icbmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_blmLimitsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_profileTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_locRightsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
+ TQObject::connect( m_ssiActivateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) );
}
@@ -95,7 +95,7 @@ void ServiceSetupTask::childTaskFinished()
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Sending DC info and client ready" << endl;
SendIdleTimeTask* sitt = new SendIdleTimeTask( client()->rootTask() );
- QValueList<int> familyList;
+ TQValueList<int> familyList;
familyList.append( 0x0001 );
familyList.append( 0x0002 );
familyList.append( 0x0003 );
@@ -114,7 +114,7 @@ void ServiceSetupTask::childTaskFinished()
if ( m_finishedTaskCount == 8 )
{
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Service setup finished" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
}
diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.cpp b/kopete/protocols/oscar/liboscar/snacprotocol.cpp
index 3bf16bbc..3ec5c348 100644
--- a/kopete/protocols/oscar/liboscar/snacprotocol.cpp
+++ b/kopete/protocols/oscar/liboscar/snacprotocol.cpp
@@ -19,9 +19,9 @@
#include "snacprotocol.h"
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <qobject.h>
+#include <tqcstring.h>
+#include <tqdatastream.h>
+#include <tqobject.h>
#include <kdebug.h>
#include <stdlib.h>
#include "transfer.h"
@@ -29,7 +29,7 @@
using namespace Oscar;
-SnacProtocol::SnacProtocol(QObject *parent, const char *name)
+SnacProtocol::SnacProtocol(TQObject *parent, const char *name)
: InputProtocolBase(parent, name)
{
}
@@ -38,7 +38,7 @@ SnacProtocol::~SnacProtocol()
{
}
-Transfer* SnacProtocol::parse( const QByteArray & packet, uint& bytes )
+Transfer* SnacProtocol::parse( const TQByteArray & packet, uint& bytes )
{
BYTE b;
WORD w;
@@ -47,7 +47,7 @@ Transfer* SnacProtocol::parse( const QByteArray & packet, uint& bytes )
FLAP f;
SNAC s;
SnacTransfer *st;
- QDataStream* m_din = new QDataStream( packet, IO_ReadOnly );
+ TQDataStream* m_din = new TQDataStream( packet, IO_ReadOnly );
//flap parsing
*m_din >> b; //this should be the start byte
diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h
index eea5c032..18c6aaaa 100644
--- a/kopete/protocols/oscar/liboscar/snacprotocol.h
+++ b/kopete/protocols/oscar/liboscar/snacprotocol.h
@@ -29,7 +29,7 @@ class SnacProtocol : public InputProtocolBase
{
Q_OBJECT
public:
- SnacProtocol( QObject *parent = 0, const char *name = 0 );
+ SnacProtocol( TQObject *parent = 0, const char *name = 0 );
~SnacProtocol();
/**
@@ -39,7 +39,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an EventTransfer object if successfull, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const TQByteArray &, uint & bytes );
};
diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp
index 1e7a17d6..795d9999 100644
--- a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp
@@ -44,7 +44,7 @@ void SSIActivateTask::onGo()
Buffer* buffer = new Buffer();
Transfer* t = createTransfer( f, s, buffer );
send( t );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
// kate: tab-width 4; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp
index 59188d2b..bccb754e 100644
--- a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp
@@ -86,7 +86,7 @@ bool SSIAuthTask::take( Transfer* t )
return false;
}
-void SSIAuthTask::grantFutureAuth( const QString& uin, const QString& reason )
+void SSIAuthTask::grantFutureAuth( const TQString& uin, const TQString& reason )
{
FLAP f = { 0x02, 0, 0 };
SNAC s = { 0x0013, 0x0014, 0x0000, client()->snacSequence() };
@@ -100,7 +100,7 @@ void SSIAuthTask::grantFutureAuth( const QString& uin, const QString& reason )
send( t );
}
-void SSIAuthTask::sendAuthRequest( const QString& uin, const QString& reason )
+void SSIAuthTask::sendAuthRequest( const TQString& uin, const TQString& reason )
{
FLAP f = { 0x02, 0, 0 };
SNAC s = { 0x0013, 0x0018, 0x0000, client()->snacSequence() };
@@ -114,7 +114,7 @@ void SSIAuthTask::sendAuthRequest( const QString& uin, const QString& reason )
send( t );
}
-void SSIAuthTask::sendAuthReply( const QString& uin, const QString& reason, bool auth )
+void SSIAuthTask::sendAuthReply( const TQString& uin, const TQString& reason, bool auth )
{
FLAP f = { 0x02, 0, 0 };
SNAC s = { 0x0013, 0x001A, 0x0000, client()->snacSequence() };
@@ -132,38 +132,38 @@ void SSIAuthTask::handleFutureAuthGranted()
{
Buffer* buf = transfer()->buffer();
- QString uin = Oscar::normalize( buf->getBUIN() );
- QByteArray reason = buf->getBSTR();
+ TQString uin = Oscar::normalize( buf->getBUIN() );
+ TQByteArray reason = buf->getBSTR();
buf->getWord(); // 0x0000 - Unknown
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Future authorization granted from " << uin << endl;
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Reason: " << reason << endl;
- emit futureAuthGranted( uin, QString::fromUtf8( reason.data(), reason.size() ) );
+ emit futureAuthGranted( uin, TQString::fromUtf8( reason.data(), reason.size() ) );
}
void SSIAuthTask::handleAuthRequested()
{
Buffer* buf = transfer()->buffer();
- QString uin = Oscar::normalize( buf->getBUIN() );
- QByteArray reason = buf->getBSTR();
+ TQString uin = Oscar::normalize( buf->getBUIN() );
+ TQByteArray reason = buf->getBSTR();
buf->getWord(); // 0x0000 - Unknown
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Authorization requested from " << uin << endl;
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Reason: " << reason << endl;
- emit authRequested( uin, QString::fromUtf8( reason.data(), reason.size() ) );
+ emit authRequested( uin, TQString::fromUtf8( reason.data(), reason.size() ) );
}
void SSIAuthTask::handleAuthReplied()
{
Buffer* buf = transfer()->buffer();
- QString uin = Oscar::normalize( buf->getBUIN() );
+ TQString uin = Oscar::normalize( buf->getBUIN() );
bool accepted = buf->getByte();
- QByteArray reason = buf->getBSTR();
+ TQByteArray reason = buf->getBSTR();
if ( accepted )
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Authorization request accepted by " << uin << endl;
@@ -171,14 +171,14 @@ void SSIAuthTask::handleAuthReplied()
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Authorization request declined by " << uin << endl;
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Reason: " << reason << endl;
- emit authReplied( uin, QString::fromUtf8( reason.data(), reason.size() ), accepted );
+ emit authReplied( uin, TQString::fromUtf8( reason.data(), reason.size() ), accepted );
}
void SSIAuthTask::handleAddedMessage()
{
Buffer* buf = transfer()->buffer();
- QString uin = Oscar::normalize( buf->getBUIN() );
+ TQString uin = Oscar::normalize( buf->getBUIN() );
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "User " << uin << " added you to the contact list" << endl;
emit contactAddedYou( uin );
diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h
index d470cfe9..1760f344 100644
--- a/kopete/protocols/oscar/liboscar/ssiauthtask.h
+++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h
@@ -37,14 +37,14 @@ public:
virtual bool forMe( const Transfer* t ) const;
virtual bool take( Transfer* t );
- void grantFutureAuth( const QString& uin, const QString& reason );
- void sendAuthRequest( const QString& uin, const QString& reason );
- void sendAuthReply( const QString& uin, const QString& reason, bool auth );
+ void grantFutureAuth( const TQString& uin, const TQString& reason );
+ void sendAuthRequest( const TQString& uin, const TQString& reason );
+ void sendAuthReply( const TQString& uin, const TQString& reason, bool auth );
signals:
- void futureAuthGranted( const QString& uin, const QString& reason );
- void authRequested( const QString& uin, const QString& reason );
- void authReplied( const QString& uin, const QString& reason, bool auth );
- void contactAddedYou( const QString& uin );
+ void futureAuthGranted( const TQString& uin, const TQString& reason );
+ void authRequested( const TQString& uin, const TQString& reason );
+ void authReplied( const TQString& uin, const TQString& reason, bool auth );
+ void contactAddedYou( const TQString& uin );
private:
void handleFutureAuthGranted();
void handleAuthRequested();
diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp
index fe2a981d..d52f7f4e 100644
--- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp
@@ -26,9 +26,9 @@
SSIListTask::SSIListTask( Task* parent ) : Task( parent )
{
m_ssiManager = client()->ssiManager();
- QObject::connect( this, SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, SLOT( newContact( const Oscar::SSI& ) ) );
- QObject::connect( this, SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, SLOT( newGroup( const Oscar::SSI& ) ) );
- QObject::connect( this, SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, SLOT( newItem( const Oscar::SSI& ) ) );
+ TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) );
+ TQObject::connect( this, TQT_SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newGroup( const Oscar::SSI& ) ) );
+ TQObject::connect( this, TQT_SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newItem( const Oscar::SSI& ) ) );
}
@@ -87,7 +87,7 @@ void SSIListTask::onGo()
void SSIListTask::handleSSIListReply()
{
- QValueList<TLV> tlvList;
+ TQValueList<TLV> tlvList;
Buffer* buffer = transfer()->buffer();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "SSI Protocol version: " << buffer->getByte() << endl;
@@ -98,7 +98,7 @@ void SSIListTask::handleSSIListReply()
{
tlvList.clear();
WORD strlength = buffer->getWord();
- QString itemName = QString::fromUtf8( buffer->getBlock( strlength ), strlength );
+ TQString itemName = TQString::fromUtf8( buffer->getBlock( strlength ), strlength );
WORD groupId = buffer->getWord();
WORD itemId = buffer->getWord();
WORD itemType = buffer->getWord();
@@ -136,7 +136,7 @@ void SSIListTask::handleSSIListReply()
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "SSI List complete" << endl;
client()->ssiManager()->setListComplete( true );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
else
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Awaiting another SSI packet" << endl;
@@ -154,7 +154,7 @@ void SSIListTask::handleSSIUpToDate()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Number of items in SSI list: " << ssiItems << endl;
client()->ssiManager()->setListComplete( true );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
void SSIListTask::checkSSITimestamp()
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp
index 066e93fa..1351c237 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp
@@ -28,9 +28,9 @@
class SSIManagerPrivate
{
public:
- QValueList<Oscar::SSI> SSIList;
- QValueList<WORD> groupIdList;
- QValueList<WORD> itemIdList;
+ TQValueList<Oscar::SSI> SSIList;
+ TQValueList<WORD> groupIdList;
+ TQValueList<WORD> itemIdList;
bool complete;
DWORD lastModTime;
WORD maxContacts;
@@ -42,8 +42,8 @@ public:
WORD nextGroupId;
};
-SSIManager::SSIManager( QObject *parent, const char *name )
- : QObject( parent, name )
+SSIManager::SSIManager( TQObject *parent, const char *name )
+ : TQObject( parent, name )
{
d = new SSIManagerPrivate;
d->complete = false;
@@ -70,7 +70,7 @@ void SSIManager::clear()
if ( d->SSIList.count() > 0 )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Clearing the SSI list" << endl;
- QValueList<Oscar::SSI>::iterator it = d->SSIList.begin();
+ TQValueList<Oscar::SSI>::iterator it = d->SSIList.begin();
while ( it != d->SSIList.end() && d->SSIList.count() > 0 )
it = d->SSIList.remove( it );
@@ -141,7 +141,7 @@ void SSIManager::setParameters( WORD maxContacts, WORD maxGroups, WORD maxVisibl
{
//I'm not using k_funcinfo for these debug statements because of
//the function's long signature
- QString funcName = QString::fromLatin1( "[void SSIManager::setParameters] " );
+ TQString funcName = TQString::fromLatin1( "[void SSIManager::setParameters] " );
kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of contacts allowed in SSI: "
<< maxContacts << endl;
kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of groups allowed in SSI: "
@@ -160,7 +160,7 @@ void SSIManager::setParameters( WORD maxContacts, WORD maxGroups, WORD maxVisibl
d->maxIgnore = maxIgnore;
}
-void SSIManager::loadFromExisting( const QValueList<Oscar::SSI*>& newList )
+void SSIManager::loadFromExisting( const TQValueList<Oscar::SSI*>& newList )
{
Q_UNUSED( newList );
//FIXME: NOT Implemented!
@@ -168,7 +168,7 @@ void SSIManager::loadFromExisting( const QValueList<Oscar::SSI*>& newList )
bool SSIManager::hasItem( const Oscar::SSI& item ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
{
@@ -180,9 +180,9 @@ bool SSIManager::hasItem( const Oscar::SSI& item ) const
return false;
}
-Oscar::SSI SSIManager::findGroup( const QString &group ) const
+Oscar::SSI SSIManager::findGroup( const TQString &group ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_GROUP && (*it ).name().lower() == group.lower() )
@@ -194,7 +194,7 @@ Oscar::SSI SSIManager::findGroup( const QString &group ) const
Oscar::SSI SSIManager::findGroup( int groupId ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_GROUP && (*it ).gid() == groupId )
@@ -203,7 +203,7 @@ Oscar::SSI SSIManager::findGroup( int groupId ) const
return m_dummyItem;
}
-Oscar::SSI SSIManager::findContact( const QString &contact, const QString &group ) const
+Oscar::SSI SSIManager::findContact( const TQString &contact, const TQString &group ) const
{
if ( contact.isNull() || group.isNull() )
@@ -222,7 +222,7 @@ Oscar::SSI SSIManager::findContact( const QString &contact, const QString &group
", gr->bid= " << gr.bid() <<
", gr->type= " << gr.type() << endl;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
{
@@ -243,10 +243,10 @@ Oscar::SSI SSIManager::findContact( const QString &contact, const QString &group
return m_dummyItem;
}
-Oscar::SSI SSIManager::findContact( const QString &contact ) const
+Oscar::SSI SSIManager::findContact( const TQString &contact ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_CONTACT && (*it ).name() == contact )
@@ -257,7 +257,7 @@ Oscar::SSI SSIManager::findContact( const QString &contact ) const
Oscar::SSI SSIManager::findContact( int contactId ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it!= listEnd; ++it )
if ( ( *it ).type() == ROSTER_CONTACT && ( *it ).bid() == contactId )
@@ -266,9 +266,9 @@ Oscar::SSI SSIManager::findContact( int contactId ) const
return m_dummyItem;
}
-Oscar::SSI SSIManager::findItemForIcon( QByteArray iconHash ) const
+Oscar::SSI SSIManager::findItemForIcon( TQByteArray iconHash ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it!= listEnd; ++it )
{
@@ -278,7 +278,7 @@ Oscar::SSI SSIManager::findItemForIcon( QByteArray iconHash ) const
Buffer b(t.data);
b.skipBytes(1); //don't care about flags
BYTE iconSize = b.getByte();
- QByteArray hash( b.getBlock( iconSize ) );
+ TQByteArray hash( b.getBlock( iconSize ) );
if ( hash == iconHash )
{
Oscar::SSI s = ( *it );
@@ -291,7 +291,7 @@ Oscar::SSI SSIManager::findItemForIcon( QByteArray iconHash ) const
Oscar::SSI SSIManager::findItemForIconByRef( int ref ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it!= listEnd; ++it )
{
@@ -307,9 +307,9 @@ Oscar::SSI SSIManager::findItemForIconByRef( int ref ) const
return m_dummyItem;
}
-Oscar::SSI SSIManager::findItem( const QString &contact, int type ) const
+Oscar::SSI SSIManager::findItem( const TQString &contact, int type ) const
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it!= listEnd; ++it )
if ( ( *it ).type() == type && ( *it ).name() == contact )
@@ -318,11 +318,11 @@ Oscar::SSI SSIManager::findItem( const QString &contact, int type ) const
return m_dummyItem;
}
-QValueList<Oscar::SSI> SSIManager::groupList() const
+TQValueList<Oscar::SSI> SSIManager::groupList() const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_GROUP )
list.append( ( *it ) );
@@ -330,11 +330,11 @@ QValueList<Oscar::SSI> SSIManager::groupList() const
return list;
}
-QValueList<Oscar::SSI> SSIManager::contactList() const
+TQValueList<Oscar::SSI> SSIManager::contactList() const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_CONTACT )
list.append( ( *it ) );
@@ -342,11 +342,11 @@ QValueList<Oscar::SSI> SSIManager::contactList() const
return list;
}
-QValueList<Oscar::SSI> SSIManager::visibleList() const
+TQValueList<Oscar::SSI> SSIManager::visibleList() const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_VISIBLE )
list.append( ( *it ) );
@@ -354,11 +354,11 @@ QValueList<Oscar::SSI> SSIManager::visibleList() const
return list;
}
-QValueList<Oscar::SSI> SSIManager::invisibleList() const
+TQValueList<Oscar::SSI> SSIManager::invisibleList() const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_INVISIBLE )
list.append( ( *it ) );
@@ -366,14 +366,14 @@ QValueList<Oscar::SSI> SSIManager::invisibleList() const
return list;
}
-QValueList<Oscar::SSI> SSIManager::contactsFromGroup( const QString &group ) const
+TQValueList<Oscar::SSI> SSIManager::contactsFromGroup( const TQString &group ) const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
Oscar::SSI gr = findGroup( group );
if ( gr.isValid() )
{
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_CONTACT && (*it ).gid() == gr.gid() )
list.append( ( *it ) );
@@ -381,11 +381,11 @@ QValueList<Oscar::SSI> SSIManager::contactsFromGroup( const QString &group ) con
return list;
}
-QValueList<Oscar::SSI> SSIManager::contactsFromGroup( int groupId ) const
+TQValueList<Oscar::SSI> SSIManager::contactsFromGroup( int groupId ) const
{
- QValueList<Oscar::SSI> list;
+ TQValueList<Oscar::SSI> list;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
if ( ( *it ).type() == ROSTER_CONTACT && (*it ).gid() == groupId )
list.append( ( *it ) );
@@ -396,7 +396,7 @@ QValueList<Oscar::SSI> SSIManager::contactsFromGroup( int groupId ) const
Oscar::SSI SSIManager::visibilityItem() const
{
Oscar::SSI item = m_dummyItem;
- QValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::const_iterator it, listEnd = d->SSIList.end();
for ( it = d->SSIList.begin(); it != listEnd; ++it )
{
if ( ( *it ).type() == 0x0004 )
@@ -423,7 +423,7 @@ bool SSIManager::listComplete() const
bool SSIManager::newGroup( const Oscar::SSI& group )
{
//trying to find the group by its ID
- QValueList<Oscar::SSI>::iterator it, listEnd = d->SSIList.end();
+ TQValueList<Oscar::SSI>::iterator it, listEnd = d->SSIList.end();
if ( findGroup( group.name() ).isValid() )
return false;
@@ -465,7 +465,7 @@ bool SSIManager::updateGroup( const Oscar::SSI& group )
bool SSIManager::removeGroup( const Oscar::SSI& group )
{
- QString groupName = group.name();
+ TQString groupName = group.name();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Removing group " << group.name() << endl;
int remcount = d->SSIList.remove( group );
removeID( group );
@@ -480,7 +480,7 @@ bool SSIManager::removeGroup( const Oscar::SSI& group )
return true;
}
-bool SSIManager::removeGroup( const QString &group )
+bool SSIManager::removeGroup( const TQString &group )
{
Oscar::SSI gr = findGroup( group );
@@ -534,7 +534,7 @@ bool SSIManager::updateContact( const Oscar::SSI& contact )
bool SSIManager::removeContact( const Oscar::SSI& contact )
{
- QString contactName = contact.name();
+ TQString contactName = contact.name();
int remcount = d->SSIList.remove( contact );
removeID( contact );
@@ -548,7 +548,7 @@ bool SSIManager::removeContact( const Oscar::SSI& contact )
return true;
}
-bool SSIManager::removeContact( const QString &contact )
+bool SSIManager::removeContact( const TQString &contact )
{
Oscar::SSI ct = findContact( contact );
@@ -642,7 +642,7 @@ void SSIManager::removeID( const Oscar::SSI& item )
}
}
-WORD SSIManager::findFreeId( const QValueList<WORD>& idList, WORD fromId ) const
+WORD SSIManager::findFreeId( const TQValueList<WORD>& idList, WORD fromId ) const
{
for ( WORD id = fromId; id < 0x8000; id++ )
{
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h
index 24e87c6a..df39268c 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.h
+++ b/kopete/protocols/oscar/liboscar/ssimanager.h
@@ -22,8 +22,8 @@
#ifndef SSIMANAGER_H
#define SSIMANAGER_H
-#include <qobject.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqvaluelist.h>
#include "oscartypes.h"
#include "oscartypeclasses.h"
@@ -42,7 +42,7 @@ class KOPETE_EXPORT SSIManager : public QObject
{
Q_OBJECT
public:
- SSIManager( QObject* parent = 0, const char* name = 0 );
+ SSIManager( TQObject* parent = 0, const char* name = 0 );
~SSIManager();
@@ -73,29 +73,29 @@ public:
* The current SSI list will be overwritten and it's contents
* replaced with the data from the new list
*/
- void loadFromExisting( const QValueList<Oscar::SSI*>& newList );
+ void loadFromExisting( const TQValueList<Oscar::SSI*>& newList );
bool hasItem( const Oscar::SSI& item ) const;
- Oscar::SSI findGroup( const QString& group ) const;
+ Oscar::SSI findGroup( const TQString& group ) const;
Oscar::SSI findGroup( int groupId ) const;
- Oscar::SSI findContact( const QString& contact, const QString& group ) const;
- Oscar::SSI findContact( const QString& contact ) const;
+ Oscar::SSI findContact( const TQString& contact, const TQString& group ) const;
+ Oscar::SSI findContact( const TQString& contact ) const;
Oscar::SSI findContact( int contactId ) const;
- Oscar::SSI findItemForIcon( QByteArray iconHash ) const;
+ Oscar::SSI findItemForIcon( TQByteArray iconHash ) const;
Oscar::SSI findItemForIconByRef( int ) const;
- Oscar::SSI findItem( const QString &contact, int type ) const;
+ Oscar::SSI findItem( const TQString &contact, int type ) const;
- QValueList<Oscar::SSI> groupList() const;
- QValueList<Oscar::SSI> contactList() const;
- QValueList<Oscar::SSI> visibleList() const;
- QValueList<Oscar::SSI> invisibleList() const;
- QValueList<Oscar::SSI> contactsFromGroup( const QString& group ) const;
- QValueList<Oscar::SSI> contactsFromGroup( int groupId ) const;
+ TQValueList<Oscar::SSI> groupList() const;
+ TQValueList<Oscar::SSI> contactList() const;
+ TQValueList<Oscar::SSI> visibleList() const;
+ TQValueList<Oscar::SSI> invisibleList() const;
+ TQValueList<Oscar::SSI> contactsFromGroup( const TQString& group ) const;
+ TQValueList<Oscar::SSI> contactsFromGroup( int groupId ) const;
Oscar::SSI visibilityItem() const;
@@ -106,12 +106,12 @@ public slots:
bool newGroup( const Oscar::SSI& group );
bool updateGroup( const Oscar::SSI& group );
bool removeGroup( const Oscar::SSI& group );
- bool removeGroup( const QString& group );
+ bool removeGroup( const TQString& group );
bool newContact( const Oscar::SSI& contact );
bool updateContact( const Oscar::SSI& contact );
bool removeContact( const Oscar::SSI& contact );
- bool removeContact( const QString& contact );
+ bool removeContact( const TQString& contact );
bool newItem( const Oscar::SSI& item );
bool updateItem( const Oscar::SSI& item );
@@ -129,7 +129,7 @@ signals:
void contactUpdated( const Oscar::SSI& );
//! Emitted when we've removed a contact from the list
- void contactRemoved( const QString& contactName );
+ void contactRemoved( const TQString& contactName );
//! Emitted when we've added a new group to the list
void groupAdded( const Oscar::SSI& );
@@ -138,12 +138,12 @@ signals:
void groupUpdated( const Oscar::SSI& );
//! Emitted when we've removed a group from the ssi list
- void groupRemoved( const QString& groupName );
+ void groupRemoved( const TQString& groupName );
- void modifyError( const QString& error );
+ void modifyError( const TQString& error );
private:
- WORD findFreeId( const QValueList<WORD>& idList, WORD fromId ) const;
+ WORD findFreeId( const TQValueList<WORD>& idList, WORD fromId ) const;
SSIManagerPrivate* d;
Oscar::SSI m_dummyItem;
diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
index 2091fca8..b4194b5e 100644
--- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qstring.h>
+#include <tqstring.h>
#include "connection.h"
#include "oscarutils.h"
#include "transfer.h"
@@ -73,12 +73,12 @@ bool SSIModifyTask::take( Transfer* transfer )
return false;
}
-bool SSIModifyTask::addContact( const QString& contact, const QString& group, bool requiresAuth )
+bool SSIModifyTask::addContact( const TQString& contact, const TQString& group, bool requiresAuth )
{
m_opType = Add;
m_opSubject = Contact;
- QString newContact = Oscar::normalize( contact );
+ TQString newContact = Oscar::normalize( contact );
Oscar::SSI oldItem = m_ssiManager->findContact( newContact );
Oscar::SSI groupItem = m_ssiManager->findGroup( group );
@@ -90,7 +90,7 @@ bool SSIModifyTask::addContact( const QString& contact, const QString& group, bo
}
//create new SSI item and populate the TLV list
- QValueList<TLV> tlvList;
+ TQValueList<TLV> tlvList;
if ( requiresAuth )
{
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "This contact requires auth. adding appropriate tlv" << endl;
@@ -104,7 +104,7 @@ bool SSIModifyTask::addContact( const QString& contact, const QString& group, bo
return true;
}
-bool SSIModifyTask::removeContact( const QString& contact )
+bool SSIModifyTask::removeContact( const TQString& contact )
{
m_opType = Remove;
m_opSubject = Contact;
@@ -113,7 +113,7 @@ bool SSIModifyTask::removeContact( const QString& contact )
return true;
}
-bool SSIModifyTask::changeGroup( const QString& contact, const QString& newGroup )
+bool SSIModifyTask::changeGroup( const TQString& contact, const TQString& newGroup )
{
m_opType = Change;
m_opSubject = Group;
@@ -144,19 +144,19 @@ bool SSIModifyTask::changeGroup( const QString& contact, const QString& newGroup
return true;
}
-bool SSIModifyTask::addGroup( const QString& groupName )
+bool SSIModifyTask::addGroup( const TQString& groupName )
{
m_opType = Add;
m_opSubject = Group;
m_newItem = m_ssiManager->findGroup( groupName );
- QValueList<TLV> dummy;
+ TQValueList<TLV> dummy;
Oscar::SSI newItem( groupName, m_ssiManager->nextGroupId(), 0, ROSTER_GROUP, dummy );
m_newItem = newItem;
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Adding group '" << m_newItem.name() << "' to SSI" << endl;
return true;
}
-bool SSIModifyTask::removeGroup( const QString& groupName )
+bool SSIModifyTask::removeGroup( const TQString& groupName )
{
m_opType = Remove;
m_opSubject = Group;
@@ -165,7 +165,7 @@ bool SSIModifyTask::removeGroup( const QString& groupName )
return true;
}
-bool SSIModifyTask::renameGroup( const QString& oldName, const QString & newName )
+bool SSIModifyTask::renameGroup( const TQString& oldName, const TQString & newName )
{
m_opType = Rename;
m_opSubject = Group;
@@ -254,36 +254,36 @@ void SSIModifyTask::handleSSIAck()
break;
case 0x0002:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item to modify not found in list" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
case 0x0003:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item already exists in SSI" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
case 0x000A:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Error adding item ( invalid id, already in list, invalid data )" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
case 0x000C:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add item. Limit exceeded." << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
case 0x000D:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add ICQ item to AIM list ( and vice versa )" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
case 0x000E:
{
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add item because contact requires authorization" << endl;
Oscar::SSI groupItem = m_ssiManager->findGroup( m_newItem.gid() );
- QString groupName = groupItem.name();
+ TQString groupName = groupItem.name();
addContact( m_newItem.name(), groupName, true );
go();
break;
}
default:
kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Unknown acknowledgement code" << endl;
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
break;
}
};
@@ -391,7 +391,7 @@ void SSIModifyTask::changeGroupOnServer()
//Change the 0x00C8 TLV in the old group item to remove the bid we're
//moving to a different group
- QValueList<TLV> list = oldGroupItem.tlvList();
+ TQValueList<TLV> list = oldGroupItem.tlvList();
TLV oldIds = Oscar::findTLV( list, 0x00C8 );
if ( oldIds.type == 0x00C8 )
{
@@ -414,7 +414,7 @@ void SSIModifyTask::changeGroupOnServer()
//Change the 0x00C8 TLV in the new group item to add the bid we're
//adding to this group
- QValueList<TLV> list2 = m_groupItem.tlvList();
+ TQValueList<TLV> list2 = m_groupItem.tlvList();
TLV oldIds2 = Oscar::findTLV( list2, 0x00C8 );
TLV newGroupTLV;
if ( oldIds2.type == 0x00C8 )
@@ -466,7 +466,7 @@ void SSIModifyTask::updateSSIManager()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "and adding " << m_newItem.name() << " to SSI manager" << endl;
m_ssiManager->newItem( m_newItem );
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return;
}
@@ -479,7 +479,7 @@ void SSIModifyTask::updateSSIManager()
m_ssiManager->removeContact( m_oldItem.name() );
else if ( m_opSubject == NoSubject )
m_ssiManager->removeItem( m_oldItem );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return;
}
@@ -492,11 +492,11 @@ void SSIModifyTask::updateSSIManager()
m_ssiManager->newContact( m_newItem );
else if ( m_opSubject == NoSubject )
m_ssiManager->newItem( m_newItem );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
return;
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
void SSIModifyTask::freeIdOnError()
@@ -550,18 +550,18 @@ void SSIModifyTask::addItemToBuffer( Oscar::SSI item, Buffer* buffer )
buffer->addWord( item.type() );
buffer->addWord( item.tlvListLength() );
- QValueList<TLV>::const_iterator it = item.tlvList().begin();
- QValueList<TLV>::const_iterator listEnd = item.tlvList().end();
+ TQValueList<TLV>::const_iterator it = item.tlvList().begin();
+ TQValueList<TLV>::const_iterator listEnd = item.tlvList().end();
for( ; it != listEnd; ++it )
buffer->addTLV( ( *it ) );
}
Oscar::SSI SSIModifyTask::getItemFromBuffer( Buffer* buffer ) const
{
- QValueList<TLV> tlvList;
+ TQValueList<TLV> tlvList;
WORD strlength = buffer->getWord();
- QString itemName = QString::fromUtf8( buffer->getBlock( strlength ), strlength );
+ TQString itemName = TQString::fromUtf8( buffer->getBlock( strlength ), strlength );
WORD groupId = buffer->getWord();
WORD itemId = buffer->getWord();
WORD itemType = buffer->getWord();
diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.h b/kopete/protocols/oscar/liboscar/ssimodifytask.h
index 2c32dda3..70486cbc 100644
--- a/kopete/protocols/oscar/liboscar/ssimodifytask.h
+++ b/kopete/protocols/oscar/liboscar/ssimodifytask.h
@@ -63,29 +63,29 @@ public:
//! Set up the stuff needed to add a contact.
//! @return true if we can send the packet
- bool addContact( const QString& contact, const QString& group, bool requiresAuth = false );
+ bool addContact( const TQString& contact, const TQString& group, bool requiresAuth = false );
//! Set up the stuff needed to remove a contact.
//! @return true if we can send the packet
- bool removeContact( const QString& contact );
+ bool removeContact( const TQString& contact );
//! Set up the stuff needed to change groups
//! @return true if we can send the packet
- bool changeGroup( const QString& contact, const QString& newGroup );
+ bool changeGroup( const TQString& contact, const TQString& newGroup );
/* Group properties */
//! Add a new group to the SSI list
//! @return true if we can send the packet
- bool addGroup( const QString& groupName );
+ bool addGroup( const TQString& groupName );
//! Remove a group from the SSI list
//! @return true if we can send the packet
- bool removeGroup( const QString& groupName );
+ bool removeGroup( const TQString& groupName );
//! Rename a group on the SSI list
//! @return true if we can send the packet
- bool renameGroup( const QString& oldName, const QString& newName );
+ bool renameGroup( const TQString& oldName, const TQString& newName );
//! Add an item to the SSI list
//! Should be used for other items we don't have explicit functions for
diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp
index 0be172e8..d279061c 100644
--- a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp
@@ -81,7 +81,7 @@ void SSIParamsTask::handleParamReply()
//manually parse the TLV out of the packet, since we only want certain things
if ( buf->getWord() != 0x0004 )
{
- setError( -1, QString::null );
+ setError( -1, TQString::null );
return; //no TLV of type 0x0004, bad packet. do nothing.
}
else
@@ -95,7 +95,7 @@ void SSIParamsTask::handleParamReply()
WORD maxIgnore = buf->getWord();
client()->ssiManager()->setParameters( maxContacts, maxGroups, maxVisible, maxInvisible, maxIgnore );
}
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
// kate: tab-width 4; indent-mode csands;
diff --git a/kopete/protocols/oscar/liboscar/stream.cpp b/kopete/protocols/oscar/liboscar/stream.cpp
index 02967416..2fb302c1 100644
--- a/kopete/protocols/oscar/liboscar/stream.cpp
+++ b/kopete/protocols/oscar/liboscar/stream.cpp
@@ -19,8 +19,8 @@
#include "stream.h"
-Stream::Stream(QObject *parent)
-:QObject(parent)
+Stream::Stream(TQObject *parent)
+:TQObject(parent)
{
}
diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h
index 9fbacbda..d5bfabad 100644
--- a/kopete/protocols/oscar/liboscar/stream.h
+++ b/kopete/protocols/oscar/liboscar/stream.h
@@ -18,7 +18,7 @@
*************************************************************************
*/
-#include <qobject.h>
+#include <tqobject.h>
#ifndef OSCAR_STREAM_H
#define OSCAR_STREAM_H
@@ -42,12 +42,12 @@ public:
SystemShutdown
};
- Stream(QObject *parent=0);
+ Stream(TQObject *parent=0);
virtual ~Stream();
virtual void close()=0;
virtual int errorCondition() const=0;
- virtual QString errorText() const=0;
+ virtual TQString errorText() const=0;
/**
* Are there any messages waiting to be read
diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp
index 2c7628d7..2ec342ac 100644
--- a/kopete/protocols/oscar/liboscar/task.cpp
+++ b/kopete/protocols/oscar/liboscar/task.cpp
@@ -17,7 +17,7 @@
*************************************************************************
*/
-#include <qtimer.h>
+#include <tqtimer.h>
#include "connection.h"
#include "transfer.h"
@@ -34,7 +34,7 @@ public:
Q_UINT32 id;
bool success;
int statusCode;
- QString statusString;
+ TQString statusString;
Connection* client;
bool insignificant, deleteme, autoDelete;
bool done;
@@ -42,19 +42,19 @@ public:
};
Task::Task(Task *parent)
-:QObject(parent)
+:TQObject(parent)
{
init();
d->client = parent->client();
- connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected()));
+ connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
}
Task::Task(Connection* parent, bool)
-:QObject(0)
+:TQObject(0)
{
init();
d->client = parent;
- connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected()));
+ connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
}
Task::~Task()
@@ -77,7 +77,7 @@ void Task::init()
Task *Task::parent() const
{
- return (Task *)QObject::parent();
+ return (Task *)TQObject::parent();
}
Connection *Task::client() const
@@ -110,7 +110,7 @@ int Task::statusCode() const
return d->statusCode;
}
-const QString & Task::statusString() const
+const TQString & Task::statusString() const
{
return d->statusString;
}
@@ -124,15 +124,15 @@ void Task::go(bool autoDelete)
bool Task::take( Transfer * transfer)
{
- const QObjectList *p = children();
+ const TQObjectList *p = children();
if(!p)
return false;
// pass along the transfer to our children
- QObjectListIt it(*p);
+ TQObjectListIt it(*p);
Task *t;
for(; it.current(); ++it) {
- QObject *obj = it.current();
+ TQObject *obj = it.current();
if(!obj->inherits("Task"))
continue;
@@ -173,7 +173,7 @@ void Task::onDisconnect()
d->statusString = tr("Disconnected");
// delay this so that tasks that react don't block the shutdown
- QTimer::singleShot(0, this, SLOT(done()));
+ TQTimer::singleShot(0, this, TQT_SLOT(done()));
}
}
@@ -182,7 +182,7 @@ void Task::send( Transfer * request )
client()->send( request );
}
-void Task::setSuccess(int code, const QString &str)
+void Task::setSuccess(int code, const TQString &str)
{
if(!d->done) {
d->success = true;
@@ -192,7 +192,7 @@ void Task::setSuccess(int code, const QString &str)
}
}
-void Task::setError(int code, const QString &str)
+void Task::setError(int code, const TQString &str)
{
if(!d->done) {
d->success = false;
@@ -245,7 +245,7 @@ Transfer* Task::createTransfer( Buffer* buffer )
// void Task::debug(const char *fmt, ...)
// {
// char *buf;
-// QString str;
+// TQString str;
// int size = 1024;
// int r;
//
@@ -257,7 +257,7 @@ Transfer* Task::createTransfer( Buffer* buffer )
// va_end(ap);
//
// if(r != -1)
-// str = QString(buf);
+// str = TQString(buf);
//
// delete [] buf;
//
@@ -267,11 +267,11 @@ Transfer* Task::createTransfer( Buffer* buffer )
// debug(str);
// }
-void Task::debug(const QString &str)
+void Task::debug(const TQString &str)
{
//black hole
Q_UNUSED( str );
- //client()->debug(QString("%1: ").arg(className()) + str);
+ //client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h
index e48e02de..04513824 100644
--- a/kopete/protocols/oscar/liboscar/task.h
+++ b/kopete/protocols/oscar/liboscar/task.h
@@ -21,7 +21,7 @@
#ifndef OSCAR_TASK_H
#define OSCAR_TASK_H
-#include <qobject.h>
+#include <tqobject.h>
#include "oscartypes.h"
@@ -52,7 +52,7 @@ public:
bool success() const;
int statusCode() const;
- const QString & statusString() const;
+ const TQString & statusString() const;
void go( bool autoDelete = false );
@@ -76,10 +76,10 @@ protected:
virtual void onDisconnect();
void setId( Q_UINT32 id );
void send( Transfer * request );
- void setSuccess( int code=0, const QString &str="" );
- void setError( int code=0, const QString &str="" );
+ void setSuccess( int code=0, const TQString &str="" );
+ void setError( int code=0, const TQString &str="" );
// void debug( const char *, ... );
- void debug( const QString & );
+ void debug( const TQString & );
/**
* Used in take() to check if the offered transfer is for this Task
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index 59f392de..a7c16cea 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -2,7 +2,7 @@
#include "clientstream_test.h"
-ClientStreamTest::ClientStreamTest(int argc, char ** argv) : QApplication( argc, argv )
+ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,12 +10,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : QApplication( argc,
myConnector->setOptHostPort( "login.oscar.aol.com", 5190 );
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
// notify and start sending
- //connect( myTestObject, SIGNAL( warning(int) ), SLOT( slotWarning(int) ) );
+ //connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest()
void ClientStreamTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
index 32a0e3a9..47aeac86 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
@@ -10,9 +10,9 @@
#ifndef clientstream_test_h
#define clientstream_test_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
index 4f4e8df2..0f37f614 100644
--- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.cpp
@@ -2,11 +2,11 @@
#include <iostream>
#include "ipaddrtest.h"
-#include <qstring.h>
+#include <tqstring.h>
using namespace std;
IPAddrTest::IPAddrTest(int argc, char ** argv)
-: QApplication( argc, argv )
+: TQApplication( argc, argv )
{
}
@@ -28,13 +28,13 @@ bool IPAddrTest::testAllZeroDotted()
bool IPAddrTest::testNumericalIP()
{
- QString address = "65.93.151.168";
+ TQString address = "65.93.151.168";
return ( Oscar::getNumericalIP( address ) == 1096652712 );
}
bool IPAddrTest::testAllZeroNumerical()
{
- QString address = "0.0.0.0";
+ TQString address = "0.0.0.0";
return ( Oscar::getNumericalIP( address ) == 0 );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
index 9452ad82..f2fa0fec 100644
--- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h
@@ -10,9 +10,9 @@
#ifndef IPADDRTEST_H
#define IPADDRTEST_H
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
index 9f7ba693..2181fda3 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
@@ -29,8 +29,8 @@
#include "tester.h"
#include "chatnavtests.h"
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include <iostream>
using namespace std;
@@ -51,7 +51,7 @@ void KUnitTest::registerTests()
KUnitTest::KUnitTest()
{
- QTimer::singleShot( 0, this, SLOT(checkRun()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(checkRun()) );
m_tests.setAutoDelete( TRUE );
// m_qtests.setAutoDelete( TRUE );
@@ -75,7 +75,7 @@ int KUnitTest::runTests()
int globalSkipped = 0;
cout << "# Running normal tests... #" << endl << endl;
- QAsciiDictIterator<Tester> it( m_tests );
+ TQAsciiDictIterator<Tester> it( m_tests );
for( ; it.current(); ++it ) {
Tester* test = it.current();
@@ -109,29 +109,29 @@ int KUnitTest::runTests()
if ( 0 < numXPass ) {
cout << " Unexpected pass" << ( ( 1 == numXPass )?"":"es") << ":" << endl;
- QStringList list = test->xpassList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->xpassList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < (numFail - numXFail) ) {
cout << " Unexpected failure" << ( ( 1 == numFail )?"":"s") << ":" << endl;
- QStringList list = test->errorList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->errorList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < numXFail ) {
cout << " Expected failure" << ( ( 1 == numXFail)?"":"s") << ":" << endl;
- QStringList list = test->xfailList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->xfailList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
if ( 0 < numSkip ) {
cout << " Skipped test" << ( ( 1 == numSkip )?"":"s") << ":" << endl;
- QStringList list = test->skipList();
- for ( QStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
+ TQStringList list = test->skipList();
+ for ( TQStringList::Iterator itr = list.begin(); itr != list.end(); ++itr ) {
cout << "\t" << (*itr).latin1() << endl;
}
}
@@ -153,11 +153,11 @@ int KUnitTest::runTests()
//void KUnitTest::addTester( QTester *test )
//{
// m_qtests.insert( test, test );
-// connect( test, SIGNAL(destroyed(QObject*)),
-// SLOT(qtesterDone(QObject* )) );
+// connect( test, TQT_SIGNAL(destroyed(TQObject*)),
+// TQT_SLOT(qtesterDone(TQObject* )) );
//}
-void KUnitTest::qtesterDone( QObject *obj )
+void KUnitTest::qtesterDone( TQObject *obj )
{
// m_qtests.remove( obj );
// if ( m_qtests.isEmpty() )
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h
index 5148a82a..d2d6a04a 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h
@@ -29,9 +29,9 @@
#include "tester.h"
-#include <qobject.h>
-#include <qasciidict.h>
-#include <qptrdict.h>
+#include <tqobject.h>
+#include <tqasciidict.h>
+#include <tqptrdict.h>
#define ADD_TEST(x) addTester( #x, new x )
#define ADD_QTEST(x) addTester( new x )
@@ -51,15 +51,15 @@ public:
// void addTester( QTester *test );
private slots:
- void qtesterDone( QObject *obj );
+ void qtesterDone( TQObject *obj );
void checkRun();
private:
void registerTests();
private:
- QAsciiDict<Tester> m_tests;
-// QPtrDict<QTester> m_qtests;
+ TQAsciiDict<Tester> m_tests;
+// TQPtrDict<QTester> m_qtests;
int globalTests;
int globalPasses;
int globalFails;
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
index 6dbc9646..1d3728aa 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -2,7 +2,7 @@
#include "logintest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.h b/kopete/protocols/oscar/liboscar/tests/logintest.h
index 898a3d99..d97c336d 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.h
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp b/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
index a220e13e..3086ca64 100644
--- a/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.cpp
@@ -2,11 +2,11 @@
#include <iostream>
#include "redirecttest.h"
-#include <qcstring.h>
+#include <tqcstring.h>
using namespace std;
RedirectTest::RedirectTest(int argc, char ** argv)
-: QApplication( argc, argv ),
+: TQApplication( argc, argv ),
m_transfer(0),
m_task(0)
{
@@ -73,7 +73,7 @@ bool RedirectTest::testCookieIsSet()
return !m_task->cookie().isEmpty();
}
-Buffer* RedirectTest::SetupBuffer(WORD Service, QString Cookie)
+Buffer* RedirectTest::SetupBuffer(WORD Service, TQString Cookie)
{
Buffer* b = new Buffer;
b->addTLV16(0x000D, Service);
diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.h b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
index eda5d67a..785d61c8 100644
--- a/kopete/protocols/oscar/liboscar/tests/redirecttest.h
+++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.h
@@ -10,9 +10,9 @@
#ifndef RedirectTest_h
#define RedirectTest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "transfer.h"
#include "oscartypes.h"
@@ -39,7 +39,7 @@ public:
private:
//Helper functions
- Buffer* SetupBuffer(WORD Service, QString Cookie);
+ Buffer* SetupBuffer(WORD Service, TQString Cookie);
Task *m_root;
SnacTransfer * m_transfer;
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index a1a9e754..6ca733cc 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -2,7 +2,7 @@
#include "ssigrouptest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,14 +29,14 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myClient->setIsIcq( true );
myClient->start( server, 5190, "userid", "password" );
myClient->connectToServer( myConnection, server, true );
- QTimer::singleShot( 10000, this, SLOT(runAddGroupTest() ) );
+ TQTimer::singleShot( 10000, this, TQT_SLOT(runAddGroupTest() ) );
connected = true;
}
@@ -57,15 +57,15 @@ int main(int argc, char ** argv)
void LoginTest::runAddGroupTest()
{
qDebug( "running ssi group add test" );
- QString group = QString::fromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->addGroup( group );
- QTimer::singleShot( 5000, this, SLOT( runDelGroupTest() ) );
+ TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
}
void LoginTest::runDelGroupTest()
{
qDebug( "running ssi group del test" );
- QString group = QString::fromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->removeGroup( group );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
index 361c053b..291698ec 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
index d8e05b36..7669a945 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
@@ -2,9 +2,9 @@
#include "ssitest.h"
-#include <qstring.h>
+#include <tqstring.h>
-SSITest::SSITest(int argc, char ** argv) : QApplication( argc, argv )
+SSITest::SSITest(int argc, char ** argv) : TQApplication( argc, argv )
{
m_manager = new SSIManager(this);
@@ -19,7 +19,7 @@ SSITest::~SSITest()
void SSITest::testIt()
{
- QPtrList<TLV> tlvs;
+ TQPtrList<TLV> tlvs;
//add three groups
SSI *ssi = new SSI( "FirstGroup", 1, 1, ROSTER_GROUP, tlvs);
@@ -53,28 +53,28 @@ void SSITest::testIt()
//try to find a group by name
ssi = m_manager->findGroup("SecondGroup");
if ( ssi )
- qDebug( QString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1());
+ qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1());
else
qDebug( "Oops, group SecondGroup not found" );
//try to find a group by gid
ssi = m_manager->findGroup( 3 );
if ( ssi )
- qDebug( QString("Found group 3 with name=%1").arg( ssi->name() ).latin1() );
+ qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() );
else
qDebug( "Oops, group 3 not found" );
//try to find a contact by name
ssi = m_manager->findContact("ThirdContact");
if ( ssi )
- qDebug( QString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() );
+ qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() );
else
qDebug( "Oops, contact ThirdContact not found" );
//try to find a contact using the name and the group name
ssi = m_manager->findContact("FourthContact","SecondGroup");
if ( ssi )
- qDebug( QString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
+ qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
else
qDebug( "Oops, contact FourthContact not found" );
@@ -85,17 +85,17 @@ void SSITest::testIt()
qDebug( "Good! It has detected the group is invalid :)" );
//contacts from a group
- QValueList<SSI*> list = m_manager->contactsFromGroup("FirstGroup");
- QValueList<SSI*>::iterator it;
+ TQValueList<SSI*> list = m_manager->contactsFromGroup("FirstGroup");
+ TQValueList<SSI*>::iterator it;
qDebug( "Contacts from group FirtsGroup:" );
for ( it = list.begin(); it != list.end(); ++it)
- qDebug( QString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
//the group list
- QValueList<SSI*> list2 = m_manager->groupList();
+ TQValueList<SSI*> list2 = m_manager->groupList();
qDebug( "Group list:" );
for ( it = list2.begin(); it != list2.end(); ++it)
- qDebug( QString(" name=%1").arg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
//remove a group - this shouldn't report any debug line
m_manager->removeGroup( "SecondGroup" );
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.h b/kopete/protocols/oscar/liboscar/tests/ssitest.h
index 19206465..fbdcf2fb 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h
@@ -10,9 +10,9 @@
#ifndef ssitest_h
#define ssitest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "ssimanager.h"
diff --git a/kopete/protocols/oscar/liboscar/tests/tester.h b/kopete/protocols/oscar/liboscar/tests/tester.h
index 2cb1f3af..162473dd 100644
--- a/kopete/protocols/oscar/liboscar/tests/tester.h
+++ b/kopete/protocols/oscar/liboscar/tests/tester.h
@@ -27,7 +27,7 @@
#ifndef TESTER_H
#define TESTER_H
-#include <qstringlist.h>
+#include <tqstringlist.h>
#define CHECK( x, y ) check( __FILE__, __LINE__, #x, x, y, false )
#define XFAIL( x, y ) check( __FILE__, __LINE__, #x, x, y, true )
@@ -50,26 +50,26 @@ public:
return m_tests;
}
- QStringList errorList() const {
+ TQStringList errorList() const {
return m_errorList;
}
- QStringList xfailList() const {
+ TQStringList xfailList() const {
return m_xfailList;
}
- QStringList xpassList() const {
+ TQStringList xpassList() const {
return m_xpassList;
}
- QStringList skipList() const {
+ TQStringList skipList() const {
return m_skipList;
}
- void skip( const char *file, int line, QString msg )
+ void skip( const char *file, int line, TQString msg )
{
- QString skipEntry;
- QTextStream ts( &skipEntry, IO_WriteOnly );
+ TQString skipEntry;
+ TQTextStream ts( &skipEntry, IO_WriteOnly );
ts << file << "["<< line <<"]: " << msg;
m_skipList.append( skipEntry );
@@ -83,8 +83,8 @@ protected:
bool expectedFailure )
{
if ( result != expectedResult ) {
- QString error;
- QTextStream ts( &error, IO_WriteOnly );
+ TQString error;
+ TQTextStream ts( &error, IO_WriteOnly );
ts << file << "["<< line <<"]:"
<<" failed on \""<< str <<"\""
<< "\n\t\t result = '"
@@ -99,8 +99,8 @@ protected:
// then the test passed, but we want to record it if
// we were expecting a failure
if (expectedFailure) {
- QString error;
- QTextStream ts( &error, IO_WriteOnly );
+ TQString error;
+ TQTextStream ts( &error, IO_WriteOnly );
ts << file << "["<< line <<"]:"
<<" unexpectedly passed on \""
<< str <<"\"";
@@ -111,10 +111,10 @@ protected:
}
private:
- QStringList m_errorList;
- QStringList m_xfailList;
- QStringList m_xpassList;
- QStringList m_skipList;
+ TQStringList m_errorList;
+ TQStringList m_xfailList;
+ TQStringList m_xpassList;
+ TQStringList m_skipList;
int m_tests;
};
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index 72ef5acb..fb346d26 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -2,7 +2,7 @@
#include "userinfotest.h"
-LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
+LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv )
{
// set up client stream
myConnector = new KNetworkConnector( 0 );
@@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : QApplication( argc, argv )
myTestObject = new ClientStream( myConnector, myConnector);
// notify when the transport layer is connected
- //connect( myTestObject, SIGNAL( connected() ), SLOT( slotConnected() ) );
+ //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
myClient = new Client();
myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" );
myConnection->setClient( myClient );
// do test once the event loop is running
- QTimer::singleShot( 0, this, SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
connected = false;
}
@@ -29,15 +29,15 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- QString server = QString::fromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myClient->setIsIcq( true );
myClient->start( server, 5190, "userid", "password" );
myClient->connectToServer( myConnection, server, true );
- //QObject::connect( myClient, SIGNAL( userIsOnline( const QString& ) ), this, SLOT( runUserInfoTest()));
- //QTimer::singleShot( 6000, this, SLOT(runUserInfoTest() ) );
+ //TQObject::connect( myClient, TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( runUserInfoTest()));
+ //TQTimer::singleShot( 6000, this, TQT_SLOT(runUserInfoTest() ) );
connected = true;
}
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
void LoginTest::runUserInfoTest()
{
qDebug( "running user info test" );
- QString contact = QString::fromLatin1( "userid" );
+ TQString contact = TQString::fromLatin1( "userid" );
myClient->requestFullInfo( contact );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
index 433a6c48..76450466 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
@@ -10,9 +10,9 @@
#ifndef logintest_h
#define logintest_h
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <tqglobal.h>
+#include <tqapplication.h>
+#include <tqtimer.h>
#include "oscarclientstream.h"
#include "oscarconnector.h"
diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp
index b442a97c..ac83ac06 100644
--- a/kopete/protocols/oscar/liboscar/transfer.cpp
+++ b/kopete/protocols/oscar/liboscar/transfer.cpp
@@ -19,7 +19,7 @@
#include "transfer.h"
#include <ctype.h>
-#include <qdeepcopy.h>
+#include <tqdeepcopy.h>
#include <kdebug.h>
Transfer::Transfer()
@@ -38,10 +38,10 @@ Transfer::TransferType Transfer::type() const
return Transfer::RawTransfer;
}
-QByteArray Transfer::toWire()
+TQByteArray Transfer::toWire()
{
m_wireFormat.duplicate( m_buffer->buffer(), m_buffer->length() );
- QByteArray wire = QDeepCopy<QByteArray>( m_wireFormat );
+ TQByteArray wire = TQDeepCopy<TQByteArray>( m_wireFormat );
return wire;
}
@@ -71,17 +71,17 @@ bool Transfer::dataValid() const
return m_isBufferValid;
}
-QString Transfer::toString() const
+TQString Transfer::toString() const
{
// line format:
//00 03 00 0b 00 00 90 b8 f5 9f 09 31 31 33 37 38 |;tJ�..........|
int i = 0;
- QString output = "\n";
- QString hex, ascii;
+ TQString output = "\n";
+ TQString hex, ascii;
- QByteArray::ConstIterator it;
- QByteArray::ConstIterator end = m_wireFormat.end();
+ TQByteArray::ConstIterator it;
+ TQByteArray::ConstIterator end = m_wireFormat.end();
for ( it = m_wireFormat.begin(); it != end; ++it )
{
i++;
@@ -90,7 +90,7 @@ QString Transfer::toString() const
if(c < 0x10)
hex.append("0");
- hex.append(QString("%1 ").arg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
@@ -98,8 +98,8 @@ QString Transfer::toString() const
{
output += hex + " |" + ascii + "|\n";
i=0;
- hex=QString::null;
- ascii=QString::null;
+ hex=TQString::null;
+ ascii=TQString::null;
}
}
@@ -110,7 +110,7 @@ QString Transfer::toString() const
return output;
}
-void Transfer::populateWireBuffer( int offset, const QByteArray& buffer )
+void Transfer::populateWireBuffer( int offset, const TQByteArray& buffer )
{
int j;
for ( uint i = 0; i < buffer.size(); ++i )
@@ -159,13 +159,13 @@ FlapTransfer::~FlapTransfer()
}
-QByteArray FlapTransfer::toWire()
+TQByteArray FlapTransfer::toWire()
{
//kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Buffer length is " << m_buffer.length() << endl;
//kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Buffer is " << m_buffer.toString() << endl;
m_wireFormat.truncate( 0 );
- QByteArray useBuf;
+ TQByteArray useBuf;
useBuf.duplicate( m_buffer->buffer(), m_buffer->length() );
m_flapLength = useBuf.size();
m_wireFormat.resize( 6 + m_flapLength );
@@ -178,7 +178,7 @@ QByteArray FlapTransfer::toWire()
//deepcopy the high-level buffer to the wire format buffer
populateWireBuffer( 6, useBuf );
- QByteArray wire = QDeepCopy<QByteArray>( m_wireFormat );
+ TQByteArray wire = TQDeepCopy<TQByteArray>( m_wireFormat );
return wire;
}
@@ -273,11 +273,11 @@ SnacTransfer::~SnacTransfer()
}
-QByteArray SnacTransfer::toWire()
+TQByteArray SnacTransfer::toWire()
{
m_wireFormat.truncate( 0 );
- QByteArray useBuf;
+ TQByteArray useBuf;
useBuf.duplicate( m_buffer->buffer(), m_buffer->length() );
setFlapLength( useBuf.size() + 10 );
m_wireFormat.resize( 16 + useBuf.size() );
@@ -304,7 +304,7 @@ QByteArray SnacTransfer::toWire()
//deepcopy the high-level buffer to the wire format buffer
populateWireBuffer( 16, useBuf );
- QByteArray wire = QDeepCopy<QByteArray>( m_wireFormat );
+ TQByteArray wire = TQDeepCopy<TQByteArray>( m_wireFormat );
return wire;
}
diff --git a/kopete/protocols/oscar/liboscar/transfer.h b/kopete/protocols/oscar/liboscar/transfer.h
index f42b1e83..0ec4fc41 100644
--- a/kopete/protocols/oscar/liboscar/transfer.h
+++ b/kopete/protocols/oscar/liboscar/transfer.h
@@ -34,7 +34,7 @@ public:
virtual TransferType type() const;
- virtual QByteArray toWire();
+ virtual TQByteArray toWire();
//! Set the data buffer
void setBuffer( Buffer* buffer );
@@ -47,13 +47,13 @@ public:
//! Get the validity of the data after the flap header
bool dataValid() const;
- QString toString() const;
+ TQString toString() const;
- void populateWireBuffer( int offset, const QByteArray& buffer );
+ void populateWireBuffer( int offset, const TQByteArray& buffer );
protected:
//! The wire-format representation of our buffer
- QByteArray m_wireFormat;
+ TQByteArray m_wireFormat;
//! The high-level representation of our data
Buffer* m_buffer;
@@ -75,7 +75,7 @@ public:
virtual ~FlapTransfer();
virtual TransferType type() const;
- virtual QByteArray toWire();
+ virtual TQByteArray toWire();
//! Set the FLAP channel
@@ -123,7 +123,7 @@ public:
virtual ~SnacTransfer();
TransferType type() const;
- virtual QByteArray toWire();
+ virtual TQByteArray toWire();
//! Set the SNAC service
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
index 76503116..f3c34f96 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp
@@ -16,7 +16,7 @@
#include "typingnotifytask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "transfer.h"
#include "buffer.h"
@@ -79,7 +79,7 @@ void TypingNotifyTask::onGo()
Transfer* t = createTransfer( f, s, b );
send( t );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
void TypingNotifyTask::handleNotification()
@@ -90,7 +90,7 @@ void TypingNotifyTask::handleNotification()
//I don't care about the QWORD or the channel
b->skipBytes( 10 );
- QString contact( b->getBUIN() );
+ TQString contact( b->getBUIN() );
Q_UINT32 word = b->getWord();
switch ( word )
@@ -112,7 +112,7 @@ void TypingNotifyTask::handleNotification()
}
}
-void TypingNotifyTask::setParams( const QString& contact, int notifyType )
+void TypingNotifyTask::setParams( const TQString& contact, int notifyType )
{
m_contact = contact;
m_notificationType = notifyType;
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h
index b2c9bfef..34c5d86a 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.h
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h
@@ -18,7 +18,7 @@
#define _TYPINGNOTIFYTASK_H_
#include "task.h"
-#include <qstring.h>
+#include <tqstring.h>
#include "oscartypeclasses.h"
/**
@@ -38,14 +38,14 @@ public:
virtual bool take( Transfer* transfer );
virtual void onGo();
- void setParams( const QString & contact, int notifyType );
+ void setParams( const TQString & contact, int notifyType );
signals:
//! somebody started typing on the other end
- void typingStarted( const QString& contact );
+ void typingStarted( const TQString& contact );
//! somebody finished typing
- void typingFinished( const QString& contact );
+ void typingFinished( const TQString& contact );
private:
@@ -54,7 +54,7 @@ private:
private:
WORD m_notificationType;
- QString m_contact;
+ TQString m_contact;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index db7d4d1d..8a1b6c4e 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.cpp
+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
@@ -23,7 +23,7 @@
#include <netinet/in.h>
#include <kdebug.h>
#include <klocale.h>
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include "oscarutils.h"
#include "oscardebug.h"
@@ -67,7 +67,7 @@ int UserDetails::warningLevel() const
return m_warningLevel;
}
-QString UserDetails::userId() const
+TQString UserDetails::userId() const
{
return m_userId;
}
@@ -92,12 +92,12 @@ DWORD UserDetails::dcPort() const
return m_dcPort;
}
-QDateTime UserDetails::onlineSinceTime() const
+TQDateTime UserDetails::onlineSinceTime() const
{
return m_onlineSince;
}
-QDateTime UserDetails::memberSinceTime() const
+TQDateTime UserDetails::memberSinceTime() const
{
return m_memberSince;
}
@@ -117,12 +117,12 @@ BYTE UserDetails::iconCheckSumType() const
return m_iconChecksumType;
}
-QByteArray UserDetails::buddyIconHash() const
+TQByteArray UserDetails::buddyIconHash() const
{
return m_md5IconHash;
}
-QString UserDetails::clientName() const
+TQString UserDetails::clientName() const
{
if ( !m_clientVersion.isEmpty() )
return i18n("Translators: client-name client-version",
@@ -134,7 +134,7 @@ QString UserDetails::clientName() const
void UserDetails::fill( Buffer * buffer )
{
BYTE snLen = buffer->getByte();
- QString user = QString( buffer->getBlock( snLen ) );
+ TQString user = TQString( buffer->getBlock( snLen ) );
if ( !user.isEmpty() )
m_userId = user;
m_warningLevel = buffer->getWord();
@@ -186,7 +186,7 @@ void UserDetails::fill( Buffer * buffer )
m_extendedStatus = b.getDWord();
m_extendedStatusSpecified = true;
#ifdef OSCAR_USERINFO_DEBUG
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << QString::number( m_extendedStatus, 16 ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl;
#endif
break;
case 0x000A: //external IP address
@@ -270,7 +270,7 @@ void UserDetails::fill( Buffer * buffer )
case 0x0002:
if ( length > 0 )
{
- m_availableMessage = QString( b.getBSTR() );
+ m_availableMessage = TQString( b.getBSTR() );
#ifdef OSCAR_USERINFO_DEBUG
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "available message:" << m_availableMessage << endl;
#endif
@@ -366,9 +366,9 @@ void UserDetails::detectClient()
case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda
{
if (m_dcLastExtStatusUpdateTime & 0x80000000)
- m_clientName=QString::fromLatin1("Miranda alpha");
+ m_clientName=TQString::fromLatin1("Miranda alpha");
else
- m_clientName=QString::fromLatin1("Miranda");
+ m_clientName=TQString::fromLatin1("Miranda");
DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF);
BYTE major1 = ((version >> 24) & 0xFF);
@@ -391,25 +391,25 @@ void UserDetails::detectClient()
}
break;
case 0xFFFFFF8FL:
- m_clientName = QString::fromLatin1("StrICQ");
+ m_clientName = TQString::fromLatin1("StrICQ");
break;
case 0xFFFFFF42L:
- m_clientName = QString::fromLatin1("mICQ");
+ m_clientName = TQString::fromLatin1("mICQ");
break;
case 0xFFFFFFBEL:
- m_clientName = QString::fromLatin1("alicq");
+ m_clientName = TQString::fromLatin1("alicq");
break;
case 0xFFFFFF7FL:
- m_clientName = QString::fromLatin1("&RQ");
+ m_clientName = TQString::fromLatin1("&RQ");
break;
case 0xFFFFFFABL:
- m_clientName = QString::fromLatin1("YSM");
+ m_clientName = TQString::fromLatin1("YSM");
break;
case 0x3AA773EEL:
if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) &&
(m_dcLastExtInfoUpdateTime == 0x3A877A42L))
{
- m_clientName=QString::fromLatin1("libicq2000");
+ m_clientName=TQString::fromLatin1("libicq2000");
}
break;
default:
@@ -427,48 +427,48 @@ void UserDetails::detectClient()
switch (m_dcProtoVersion)
{
case 10:
- m_clientName=QString::fromLatin1("ICQ 2003b");
+ m_clientName=TQString::fromLatin1("ICQ 2003b");
break;
case 9:
- m_clientName=QString::fromLatin1("ICQ Lite");
+ m_clientName=TQString::fromLatin1("ICQ Lite");
break;
case 8:
- m_clientName=QString::fromLatin1("Miranda");
+ m_clientName=TQString::fromLatin1("Miranda");
break;
default:
- m_clientName=QString::fromLatin1("ICQ2go");
+ m_clientName=TQString::fromLatin1("ICQ2go");
}
}
else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ
{
- m_clientName = QString::fromLatin1("Gaim");
+ m_clientName = TQString::fromLatin1("Gaim");
}
else if (hasCap(CAP_XTRAZ))
{
- m_clientName = QString::fromLatin1("ICQ 4.0 Lite");
+ m_clientName = TQString::fromLatin1("ICQ 4.0 Lite");
}
else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
hasCap(CAP_IS_2001))
{
- m_clientName = QString::fromLatin1( "ICQ 2001");
+ m_clientName = TQString::fromLatin1( "ICQ 2001");
}
else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
hasCap(CAP_STR_2002))
{
- m_clientName = QString::fromLatin1("ICQ 2002");
+ m_clientName = TQString::fromLatin1("ICQ 2002");
}
else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) &&
hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
{
- m_clientName = QString::fromLatin1("ICQ 2003a");
+ m_clientName = TQString::fromLatin1("ICQ 2003a");
}
else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
{
- m_clientName =QString::fromLatin1("ICQ 2001b");
+ m_clientName =TQString::fromLatin1("ICQ 2001b");
}
else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS))
{
- m_clientName = QString::fromLatin1("GnomeICU");
+ m_clientName = TQString::fromLatin1("GnomeICU");
}
}
diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h
index fad79172..8835f6f9 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.h
+++ b/kopete/protocols/oscar/liboscar/userdetails.h
@@ -35,19 +35,19 @@ public:
UserDetails();
~UserDetails();
- QString userId() const; //! User ID accessor
+ TQString userId() const; //! User ID accessor
int warningLevel() const; //! Warning level accessor
WORD idleTime() const; //! Idle time accessor
KNetwork::KIpAddress dcInternalIp() const; //! DC local IP accessor
KNetwork::KIpAddress dcExternalIp() const; //! DC outside IP accessor
DWORD dcPort() const; //! DC port number
- QDateTime onlineSinceTime() const; //! Online since accessor
- QDateTime memberSinceTime() const; //! Member since accessor
+ TQDateTime onlineSinceTime() const; //! Online since accessor
+ TQDateTime memberSinceTime() const; //! Member since accessor
int userClass() const; //! User class accessor
DWORD extendedStatus() const; //!User status accessor
BYTE iconCheckSumType() const; //!Buddy icon hash type
- QByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor
- QString clientName() const; //! Client name and version
+ TQByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor
+ TQString clientName() const; //! Client name and version
bool hasCap( int capNumber ) const; //! Tell if we have this capability
/**
@@ -78,17 +78,17 @@ private:
private:
- QString m_userId; /// the screename/uin of the contact
+ TQString m_userId; /// the screename/uin of the contact
int m_warningLevel; /// the warning level of the contact
int m_userClass; /// the class of the user - TLV 0x01
- QDateTime m_memberSince; /// how long the user's been a member - TLV 0x05
- QDateTime m_onlineSince; /// how long the contact's been online - TLV 0x03
+ TQDateTime m_memberSince; /// how long the user's been a member - TLV 0x05
+ TQDateTime m_onlineSince; /// how long the contact's been online - TLV 0x03
DWORD m_numSecondsOnline; /// how long the contact's been online in seconds
WORD m_idleTime; /// the idle time of the contact - TLV 0x0F
DWORD m_extendedStatus; /// the extended status of the contact - TLV 0x06
DWORD m_capabilities; //TLV 0x05
- QString m_clientVersion; /// the version of client they're using
- QString m_clientName; /// the name of the client they're using
+ TQString m_clientVersion; /// the version of client they're using
+ TQString m_clientName; /// the name of the client they're using
KNetwork::KIpAddress m_dcOutsideIp; /// DC Real IP Address - TLV 0x0A
KNetwork::KIpAddress m_dcInsideIp; /// DC Internal IP Address - TLV 0x0C
DWORD m_dcPort; /// DC Port - TLV 0x0C
@@ -101,8 +101,8 @@ private:
DWORD m_dcLastExtInfoUpdateTime; /// DC last exteneded info update time - TLV 0x0C
DWORD m_dcLastExtStatusUpdateTime; /// DC last extended status update time - TLV 0x0C
BYTE m_iconChecksumType; /// The OSCAR checksum type for the buddy icon TLV 0x1D
- QByteArray m_md5IconHash; /// Buddy Icon MD5 Hash - TLV 0x1D
- QString m_availableMessage; /// Message a person can have when available - TLV 0x0D
+ TQByteArray m_md5IconHash; /// Buddy Icon MD5 Hash - TLV 0x1D
+ TQString m_availableMessage; /// Message a person can have when available - TLV 0x0D
bool m_userClassSpecified;
bool m_memberSinceSpecified;
diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp
index a204c475..66197316 100644
--- a/kopete/protocols/oscar/liboscar/userinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp
@@ -75,28 +75,28 @@ bool UserInfoTask::take( Transfer * transfer )
m_sequenceInfoMap[seq] = ud;
emit gotInfo( seq );
- QValueList<TLV> list = b->getTLVList();
- QValueList<TLV>::iterator it = list.begin();
- QString profile;
- QString away;
+ TQValueList<TLV> list = b->getTLVList();
+ TQValueList<TLV>::iterator it = list.begin();
+ TQString profile;
+ TQString away;
for ( ; ( *it ); ++it )
{
switch( ( *it ).type )
{
case 0x0001: //profile text encoding
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "text encoding is " << QString( ( *it ).data )<< endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "text encoding is " << TQString( ( *it ).data )<< endl;
break;
case 0x0002: //profile text
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "The profile is '" << QString( ( *it ).data ) << "'" << endl;
- profile = QString( ( *it ).data ); // aim always seems to use us-ascii encoding
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "The profile is '" << TQString( ( *it ).data ) << "'" << endl;
+ profile = TQString( ( *it ).data ); // aim always seems to use us-ascii encoding
emit receivedProfile( m_contactSequenceMap[seq], profile );
break;
case 0x0003: //away message encoding
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Away message encoding is " << QString( ( *it ).data ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Away message encoding is " << TQString( ( *it ).data ) << endl;
break;
case 0x0004: //away message
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Away message is '" << QString( ( *it ).data ) << "'" << endl;
- away = QString( (*it ).data ); // aim always seems to use us-ascii encoding
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Away message is '" << TQString( ( *it ).data ) << "'" << endl;
+ away = TQString( (*it ).data ); // aim always seems to use us-ascii encoding
emit receivedAwayMessage( m_contactSequenceMap[seq], away );
break;
case 0x0005: //capabilities
@@ -133,7 +133,7 @@ void UserInfoTask::onGo()
send( t );
}
-void UserInfoTask::requestInfoFor( const QString& contact, unsigned int types )
+void UserInfoTask::requestInfoFor( const TQString& contact, unsigned int types )
{
Q_UINT16 seq = client()->snacSequence();
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting sequence " << seq << " for contact " << contact << endl;
diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h
index 063eedd7..4b973a04 100644
--- a/kopete/protocols/oscar/liboscar/userinfotask.h
+++ b/kopete/protocols/oscar/liboscar/userinfotask.h
@@ -20,7 +20,7 @@
#include "task.h"
-#include <qstring.h>
+#include <tqstring.h>
#include "userdetails.h"
class Transfer;
@@ -44,20 +44,20 @@ public:
bool take( Transfer* transfer );
void onGo();
- void requestInfoFor( const QString& userId, unsigned int types );
+ void requestInfoFor( const TQString& userId, unsigned int types );
UserDetails getInfoFor( Q_UINT16 sequence ) const;
- QString contactForSequence( Q_UINT16 sequence ) const;
+ TQString contactForSequence( Q_UINT16 sequence ) const;
signals:
void gotInfo( Q_UINT16 seqNumber );
- void receivedProfile( const QString& contact, const QString& profile );
- void receivedAwayMessage( const QString& contact, const QString& message );
+ void receivedProfile( const TQString& contact, const TQString& profile );
+ void receivedAwayMessage( const TQString& contact, const TQString& message );
private:
- QMap<Q_UINT16, UserDetails> m_sequenceInfoMap;
- QMap<Q_UINT16, QString> m_contactSequenceMap;
- QMap<Q_UINT16, unsigned int> m_typesSequenceMap;
+ TQMap<Q_UINT16, UserDetails> m_sequenceInfoMap;
+ TQMap<Q_UINT16, TQString> m_contactSequenceMap;
+ TQMap<Q_UINT16, unsigned int> m_typesSequenceMap;
Q_UINT16 m_seq;
};
diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp
index 3fd31010..545706a5 100644
--- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp
+++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp
@@ -98,14 +98,14 @@ bool UserSearchTask::take( Transfer* t )
{
int moreUsersCount = buffer->getLEDWord();
emit searchFinished( moreUsersCount );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
}
setTransfer( 0 );
}
return true;
}
-void UserSearchTask::searchUserByUIN( const QString& uin )
+void UserSearchTask::searchUserByUIN( const TQString& uin )
{
//create a new result list
m_type = UINSearch;
diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h
index 239efe36..781a311a 100644
--- a/kopete/protocols/oscar/liboscar/usersearchtask.h
+++ b/kopete/protocols/oscar/liboscar/usersearchtask.h
@@ -20,7 +20,7 @@
#define USERSEARCHTASK_H
#include "icqtask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include "icquserinfo.h"
/**
@@ -43,7 +43,7 @@ public:
virtual bool take( Transfer* t );
/** Search by UIN */
- void searchUserByUIN( const QString& uin );
+ void searchUserByUIN( const TQString& uin );
void searchWhitePages( const ICQWPSearchInfo& info );
@@ -52,8 +52,8 @@ signals:
void searchFinished( int );
private:
- QValueList<ICQSearchResult> m_results;
- QString m_uin;
+ TQValueList<ICQSearchResult> m_results;
+ TQString m_uin;
Q_UINT16 m_seq;
SearchType m_type;
};
diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp
index 56051dc8..7b895b5c 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.cpp
+++ b/kopete/protocols/oscar/liboscar/warningtask.cpp
@@ -18,7 +18,7 @@
#include "warningtask.h"
-#include <qstring.h>
+#include <tqstring.h>
#include <kdebug.h>
#include "transfer.h"
#include "connection.h"
@@ -32,7 +32,7 @@ WarningTask::~WarningTask()
{
}
-void WarningTask::setContact( const QString& contact )
+void WarningTask::setContact( const TQString& contact )
{
m_contact = contact;
}
@@ -65,13 +65,13 @@ bool WarningTask::take( Transfer* transfer )
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Warning level increased " << m_increase
<< " to " << m_newLevel << endl;
emit userWarned( m_contact, m_increase, m_newLevel );
- setSuccess( 0, QString::null );
+ setSuccess( 0, TQString::null );
setTransfer( 0 );
return true;
}
else
{
- setError( 0, QString::null );
+ setError( 0, TQString::null );
return false;
}
}
diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h
index 1280fab9..af56968c 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.h
+++ b/kopete/protocols/oscar/liboscar/warningtask.h
@@ -20,7 +20,7 @@
#define WARNINGTASK_H
#include "task.h"
-#include <qmap.h>
+#include <tqmap.h>
#include "oscartypes.h"
/**
@@ -33,7 +33,7 @@ public:
WarningTask( Task* parent );
~WarningTask();
- void setContact( const QString& contact );
+ void setContact( const TQString& contact );
void setAnonymous( bool anon );
WORD levelIncrease();
@@ -44,10 +44,10 @@ public:
virtual void onGo();
signals:
- void userWarned( const QString&, Q_UINT16, Q_UINT16 );
+ void userWarned( const TQString&, Q_UINT16, Q_UINT16 );
private:
- QString m_contact;
+ TQString m_contact;
bool m_sendAnon;
WORD m_sequence;
WORD m_increase;