From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/protocols/oscar/liboscar/buffer.cpp | 4 +- .../oscar/liboscar/chatnavservicetask.cpp | 2 +- .../protocols/oscar/liboscar/chatservicetask.cpp | 4 +- kopete/protocols/oscar/liboscar/client.cpp | 30 ++++++------- kopete/protocols/oscar/liboscar/client.h | 12 ++--- kopete/protocols/oscar/liboscar/coreprotocol.cpp | 4 +- .../oscar/liboscar/messagereceivertask.cpp | 8 ++-- kopete/protocols/oscar/liboscar/oscarmessage.cpp | 2 +- .../protocols/oscar/liboscar/oscartypeclasses.cpp | 2 +- kopete/protocols/oscar/liboscar/rtf.cc | 2 +- kopete/protocols/oscar/liboscar/rtf.ll | 2 +- kopete/protocols/oscar/liboscar/rtf2html.h | 2 +- kopete/protocols/oscar/liboscar/senddcinfotask.cpp | 4 +- kopete/protocols/oscar/liboscar/senddcinfotask.h | 2 +- .../protocols/oscar/liboscar/sendmessagetask.cpp | 6 +-- kopete/protocols/oscar/liboscar/ssimanager.cpp | 2 +- kopete/protocols/oscar/liboscar/task.cpp | 4 +- .../oscar/liboscar/tests/clientstream_test.cpp | 2 +- .../protocols/oscar/liboscar/tests/logintest.cpp | 2 +- .../oscar/liboscar/tests/ssigrouptest.cpp | 6 +-- kopete/protocols/oscar/liboscar/tests/ssitest.cpp | 12 ++--- .../oscar/liboscar/tests/userinfotest.cpp | 4 +- kopete/protocols/oscar/liboscar/transfer.cpp | 2 +- kopete/protocols/oscar/liboscar/userdetails.cpp | 52 +++++++++++----------- kopete/protocols/oscar/liboscar/userdetails.h | 4 +- 25 files changed, 88 insertions(+), 88 deletions(-) (limited to 'kopete/protocols/oscar/liboscar') diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp index 48f68349..c778d382 100644 --- a/kopete/protocols/oscar/liboscar/buffer.cpp +++ b/kopete/protocols/oscar/liboscar/buffer.cpp @@ -376,7 +376,7 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange, void Buffer::expandBuffer(unsigned int inc) { - mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim); + mBuffer.tqresize(mBuffer.size()+inc, TQGArray::SpeedOptim); } TQCString Buffer::getLNTS() @@ -477,7 +477,7 @@ TQString Buffer::toString() const if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 3004af0c..23136db4 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -262,7 +262,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t ) kdDebug(OSCAR_RAW_DEBUG) << "moderator" << endl; break; case 0x6D: - kdDebug(OSCAR_RAW_DEBUG) << "num children" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "num tqchildren" << endl; break; case 0x06F: kdDebug(OSCAR_RAW_DEBUG) << "occupancy" << endl; diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp index 5e264923..ff3159f4 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "connection.h" #include "transfer.h" @@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage() Oscar::Message omessage; omessage.setReceiver( client()->userId() ); omessage.setSender( sender ); - omessage.setTimestamp( TQDateTime::currentDateTime() ); + omessage.setTimestamp( TQDateTime::tqcurrentDateTime() ); omessage.setText( Oscar::Message::UTF8, msgText ); omessage.setType( 0x03 ); omessage.setExchange( m_exchange ); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 7cb994f8..00431434 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -21,7 +21,7 @@ #include "client.h" #include -#include +#include #include //for kdDebug() #include @@ -98,7 +98,7 @@ public: TQValueList redirectionServices; WORD currentRedirect; TQByteArray cookie; - DWORD connectAsStatus; // icq only + DWORD connectAstqStatus; // icq only TQString connectWithMessage; // icq only Oscar::Settings* settings; @@ -128,7 +128,7 @@ public: struct AwayMsgRequest { TQString contact; - ICQStatus contactStatus; + ICQtqStatus contacttqStatus; }; TQValueList awayMsgRequestQueue; TQTimer* awayMsgRequestTimer; @@ -149,7 +149,7 @@ Client::Client( TQObject* parent ) d->isIcq = false; //default to AIM d->redirectRequested = false; d->currentRedirect = 0; - d->connectAsStatus = 0x0; // default to online + d->connectAstqStatus = 0x0; // default to online d->ssiManager = new SSIManager( this ); d->settings = new Oscar::Settings(); d->errorTask = 0L; @@ -222,7 +222,7 @@ void Client::close() //don't clear the stored status between stage one and two if ( d->stage == ClientPrivate::StageTwo ) { - d->connectAsStatus = 0x0; + d->connectAstqStatus = 0x0; d->connectWithMessage = TQString(); } @@ -233,7 +233,7 @@ void Client::close() d->ssiManager->clear(); } -void Client::setStatus( AIMStatus status, const TQString &_message ) +void Client::settqStatus( AIMtqStatus status, const TQString &_message ) { // AIM: you're away exactly when your away message isn't empty. // can't use TQString() as a message either; ProfileTask @@ -257,7 +257,7 @@ void Client::setStatus( AIMStatus status, const TQString &_message ) pt->go( true ); } -void Client::setStatus( DWORD status, const TQString &message ) +void Client::settqStatus( DWORD status, const TQString &message ) { // remember the message to reply with, when requested kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting status message to "<< message << endl; @@ -292,7 +292,7 @@ void Client::setStatus( DWORD status, const TQString &message ) } else { - d->connectAsStatus = status; + d->connectAstqStatus = status; d->connectWithMessage = message; } } @@ -399,7 +399,7 @@ void Client::serviceSetupFinished() d->active = true; if ( isIcq() ) - setStatus( d->connectAsStatus, d->connectWithMessage ); + settqStatus( d->connectAstqStatus, d->connectWithMessage ); d->ownStatusTask->go(); @@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact ) d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage ); } -void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus ) +void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl; Oscar::Message msg; msg.setType( 2 ); msg.setReceiver( contact ); msg.addProperty( Oscar::Message::StatusMessageRequest ); - switch ( contactStatus ) + switch ( contacttqStatus ) { case ICQAway: msg.setMessageType( 0xE8 ); // away @@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactSt sendMessage( msg ); } -void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ) +void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for " << contact << " to queue" << endl; @@ -902,7 +902,7 @@ void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contac //remove old request if still exists removeICQAwayMessageRequest( contact ); - ClientPrivate::AwayMsgRequest amr = { contact, contactStatus }; + ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus }; d->awayMsgRequestQueue.prepend( amr ); if ( !d->awayMsgRequestTimer->isActive() ) @@ -959,7 +959,7 @@ void Client::nextICQAwayMessageRequest() amr = d->awayMsgRequestQueue.back(); d->awayMsgRequestQueue.pop_back(); - requestICQAwayMessage( amr.contact, amr.contactStatus ); + requestICQAwayMessage( amr.contact, amr.contacttqStatus ); } void Client::requestStatusInfo( const TQString& contact ) @@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo else { realHost = host; - realPort = TQString::fromLatin1("5190"); + realPort = TQString::tqfromLatin1("5190"); } Connection* c = createConnection( realHost, realPort ); diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index b09be40e..976f43be 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -68,8 +68,8 @@ public: FatalProtocolError = 3 }; - enum AIMStatus { Online = 0, Away }; - enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; + enum AIMtqStatus { Online = 0, Away }; + enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; /************* EXTERNAL API @@ -103,9 +103,9 @@ public: /** Logout and disconnect */ void close(); /** Set our status for AIM */ - void setStatus( AIMStatus status, const TQString &message = TQString() ); + void settqStatus( AIMtqStatus status, const TQString &message = TQString() ); /** Set our status for ICQ */ - void setStatus( DWORD status, const TQString &message = TQString() ); + void settqStatus( DWORD status, const TQString &message = TQString() ); /** Retrieve our user info */ UserDetails ourInfo() const; @@ -256,7 +256,7 @@ public: * Add the icq away message request to queue * \param contact the contact to get info for */ - void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ); + void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ); /** * Remove the icq away message request from queue @@ -505,7 +505,7 @@ private: * \param contact the contact to get info for */ //TODO only made a default for testing w/o frontend - void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway ); + void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway ); private: class ClientPrivate; diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 6ba825c7..638ed6c0 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -54,7 +54,7 @@ static TQString toString( const TQByteArray& buffer ) if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp index ab20d852..1bbe6622 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp @@ -16,7 +16,7 @@ #include "messagereceivertask.h" -#include +#include #include #include "transfer.h" #include "buffer.h" @@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message() msg.setSender( m_fromUser ); msg.setReceiver( client()->userId() ); - msg.setTimestamp( TQDateTime::currentDateTime() ); + msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); msg.setType( 0x01 ); emit receivedMessage( msg ); @@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message() } msg.setType( 0x04 ); - msg.setTimestamp( TQDateTime::currentDateTime() ); + msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); msg.setSender( msgSender ); msg.setReceiver( client()->userId() ); msg.setEncoding( Oscar::Message::UserDefined ); @@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg ) msg->setSender( m_fromUser ); msg->setReceiver( client()->userId() ); - msg->setTimestamp( TQDateTime::currentDateTime() ); + msg->setTimestamp( TQDateTime::tqcurrentDateTime() ); msg->setType( 0x02 ); msg->setIcbmCookie( m_icbmCookie ); msg->setProtocolVersion( protocolVersion ); diff --git a/kopete/protocols/oscar/liboscar/oscarmessage.cpp b/kopete/protocols/oscar/liboscar/oscarmessage.cpp index ddeb963d..c0b5a1b8 100644 --- a/kopete/protocols/oscar/liboscar/oscarmessage.cpp +++ b/kopete/protocols/oscar/liboscar/oscarmessage.cpp @@ -20,7 +20,7 @@ #include "oscarmessage.h" #include -#include +#include Oscar::Message::Message() diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp index 97751352..958a5d49 100644 --- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp +++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp @@ -224,7 +224,7 @@ TQByteArray Oscar::SSI::iconHash( ) const TQString Oscar::SSI::toString() const { - TQString ssiString = TQString::fromLatin1( "name: " ); + TQString ssiString = TQString::tqfromLatin1( "name: " ); ssiString += m_name; ssiString += " gid: "; ssiString += TQString::number( m_gid ); diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index 67753b20..e9048c21 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -2078,7 +2078,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index c43aeaea..47d1bdf7 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -515,7 +515,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/rtf2html.h b/kopete/protocols/oscar/liboscar/rtf2html.h index 3a3122d8..5685e4a1 100644 --- a/kopete/protocols/oscar/liboscar/rtf2html.h +++ b/kopete/protocols/oscar/liboscar/rtf2html.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp index 1a0e57c8..3bd07cb5 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp @@ -25,7 +25,7 @@ #include "oscarutils.h" #include "transfer.h" -SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mStatus(status) +SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status) { } @@ -70,7 +70,7 @@ void SendDCInfoTask::onGo() statusFlag |= 0x10000000; // Direct connection upon authorization, hides IP } - buffer->addDWord( statusFlag | mStatus ); + buffer->addDWord( statusFlag | mtqStatus ); /* Fill in the DC Info * We don't support Direct Connection yet. So fill in some diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h index d130cc40..a98b9612 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.h +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h @@ -33,7 +33,7 @@ public: virtual void onGo(); private: - DWORD mStatus; + DWORD mtqStatus; }; #endif diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index 1b8cbfbc..596e6791 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -379,8 +379,8 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) ) utfMessage=new unsigned char[length]; for(unsigned int l=0; lencoding() != 0) charset=0x0003; //send as ISO-8859-1 } -if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec so far! +if(!codec && charset != 0x0002) // it's neither tqunicode nor did we find a codec so far! { kdDebug(14151) << k_funcinfo << "Couldn't find suitable encoding for outgoing message, " << diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 1351c237..ce39965f 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -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 - TQString funcName = TQString::fromLatin1( "[void SSIManager::setParameters] " ); + TQString funcName = TQString::tqfromLatin1( "[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: " diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index d797031d..9e637d45 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our children + // pass along the transfer to our tqchildren TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -271,7 +271,7 @@ void Task::debug(const TQString &str) { //black hole Q_UNUSED( str ); - //client()->debug(TQString("%1: ").arg(className()) + str); + //client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index a7c16cea..6f62ebe6 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp @@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest() void ClientStreamTest::slotDoTest() { - TQString server = TQString::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("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/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index 1d3728aa..540aa35c 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 6ca733cc..9849bbbb 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); @@ -57,7 +57,7 @@ int main(int argc, char ** argv) void LoginTest::runAddGroupTest() { qDebug( "running ssi group add test" ); - TQString group = TQString::fromLatin1( "dummygroup" ); + TQString group = TQString::tqfromLatin1( "dummygroup" ); myClient->addGroup( group ); TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) ); } @@ -65,7 +65,7 @@ void LoginTest::runAddGroupTest() void LoginTest::runDelGroupTest() { qDebug( "running ssi group del test" ); - TQString group = TQString::fromLatin1( "dummygroup" ); + TQString group = TQString::tqfromLatin1( "dummygroup" ); myClient->removeGroup( group ); } diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp index 7669a945..9c2202a6 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp @@ -53,28 +53,28 @@ void SSITest::testIt() //try to find a group by name ssi = m_manager->findGroup("SecondGroup"); if ( ssi ) - qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1()); + qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( 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( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() ); + qDebug( TQString("Found group 3 with name=%1").tqarg( 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( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() ); + qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( 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( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() ); + qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() ); else qDebug( "Oops, contact FourthContact not found" ); @@ -89,13 +89,13 @@ void SSITest::testIt() TQValueList::iterator it; qDebug( "Contacts from group FirtsGroup:" ); for ( it = list.begin(); it != list.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); //the group list TQValueList list2 = m_manager->groupList(); qDebug( "Group list:" ); for ( it = list2.begin(); it != list2.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").tqarg( (*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/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index fb346d26..663ec2fb 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp @@ -29,7 +29,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); @@ -58,7 +58,7 @@ int main(int argc, char ** argv) void LoginTest::runUserInfoTest() { qDebug( "running user info test" ); - TQString contact = TQString::fromLatin1( "userid" ); + TQString contact = TQString::tqfromLatin1( "userid" ); myClient->requestFullInfo( contact ); } diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp index 9af57b30..100bcf9d 100644 --- a/kopete/protocols/oscar/liboscar/transfer.cpp +++ b/kopete/protocols/oscar/liboscar/transfer.cpp @@ -90,7 +90,7 @@ TQString Transfer::toString() const if(c < 0x10) hex.append("0"); - hex.append(TQString("%1 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index 8a1b6c4e..77a6c72b 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -34,7 +34,7 @@ UserDetails::UserDetails() m_warningLevel = 0; m_userClass = 0; m_idleTime = 0; - m_extendedStatus = 0; + m_extendedtqStatus = 0; m_capabilities = 0; m_dcPort = 0; m_dcType = 0; @@ -107,9 +107,9 @@ int UserDetails::userClass() const return m_userClass; } -DWORD UserDetails::extendedStatus() const +DWORD UserDetails::extendedtqStatus() const { - return m_extendedStatus; + return m_extendedtqStatus; } BYTE UserDetails::iconCheckSumType() const @@ -126,7 +126,7 @@ TQString UserDetails::clientName() const { if ( !m_clientVersion.isEmpty() ) return i18n("Translators: client-name client-version", - "%1 %2").arg(m_clientName, m_clientVersion); + "%1 %2").tqarg(m_clientName, m_clientVersion); else return m_clientName; } @@ -183,10 +183,10 @@ void UserDetails::fill( Buffer * buffer ) #endif break; case 0x0006: //extended user status - m_extendedStatus = b.getDWord(); + m_extendedtqStatus = b.getDWord(); m_extendedStatusSpecified = true; #ifdef OSCAR_USERINFO_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl; + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 16 ) << endl; #endif break; case 0x000A: //external IP address @@ -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=TQString::fromLatin1("Miranda alpha"); + m_clientName=TQString::tqfromLatin1("Miranda alpha"); else - m_clientName=TQString::fromLatin1("Miranda"); + m_clientName=TQString::tqfromLatin1("Miranda"); DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF); BYTE major1 = ((version >> 24) & 0xFF); @@ -391,25 +391,25 @@ void UserDetails::detectClient() } break; case 0xFFFFFF8FL: - m_clientName = TQString::fromLatin1("StrICQ"); + m_clientName = TQString::tqfromLatin1("StrICQ"); break; case 0xFFFFFF42L: - m_clientName = TQString::fromLatin1("mICQ"); + m_clientName = TQString::tqfromLatin1("mICQ"); break; case 0xFFFFFFBEL: - m_clientName = TQString::fromLatin1("alicq"); + m_clientName = TQString::tqfromLatin1("alicq"); break; case 0xFFFFFF7FL: - m_clientName = TQString::fromLatin1("&RQ"); + m_clientName = TQString::tqfromLatin1("&RQ"); break; case 0xFFFFFFABL: - m_clientName = TQString::fromLatin1("YSM"); + m_clientName = TQString::tqfromLatin1("YSM"); break; case 0x3AA773EEL: if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) && (m_dcLastExtInfoUpdateTime == 0x3A877A42L)) { - m_clientName=TQString::fromLatin1("libicq2000"); + m_clientName=TQString::tqfromLatin1("libicq2000"); } break; default: @@ -427,48 +427,48 @@ void UserDetails::detectClient() switch (m_dcProtoVersion) { case 10: - m_clientName=TQString::fromLatin1("ICQ 2003b"); + m_clientName=TQString::tqfromLatin1("ICQ 2003b"); break; case 9: - m_clientName=TQString::fromLatin1("ICQ Lite"); + m_clientName=TQString::tqfromLatin1("ICQ Lite"); break; case 8: - m_clientName=TQString::fromLatin1("Miranda"); + m_clientName=TQString::tqfromLatin1("Miranda"); break; default: - m_clientName=TQString::fromLatin1("ICQ2go"); + m_clientName=TQString::tqfromLatin1("ICQ2go"); } } else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ { - m_clientName = TQString::fromLatin1("Gaim"); + m_clientName = TQString::tqfromLatin1("Gaim"); } else if (hasCap(CAP_XTRAZ)) { - m_clientName = TQString::fromLatin1("ICQ 4.0 Lite"); + m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_IS_2001)) { - m_clientName = TQString::fromLatin1( "ICQ 2001"); + m_clientName = TQString::tqfromLatin1( "ICQ 2001"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_STR_2002)) { - m_clientName = TQString::fromLatin1("ICQ 2002"); + m_clientName = TQString::tqfromLatin1("ICQ 2002"); } else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) && hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName = TQString::fromLatin1("ICQ 2003a"); + m_clientName = TQString::tqfromLatin1("ICQ 2003a"); } else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName =TQString::fromLatin1("ICQ 2001b"); + m_clientName =TQString::tqfromLatin1("ICQ 2001b"); } else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS)) { - m_clientName = TQString::fromLatin1("GnomeICU"); + m_clientName = TQString::tqfromLatin1("GnomeICU"); } } @@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud ) } if ( ud.m_extendedStatusSpecified ) { - m_extendedStatus = ud.m_extendedStatus; + m_extendedtqStatus = ud.m_extendedtqStatus; m_extendedStatusSpecified = true; } if ( ud.m_capabilitiesSpecified ) diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h index 8835f6f9..367d8999 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.h +++ b/kopete/protocols/oscar/liboscar/userdetails.h @@ -44,7 +44,7 @@ public: TQDateTime onlineSinceTime() const; //! Online since accessor TQDateTime memberSinceTime() const; //! Member since accessor int userClass() const; //! User class accessor - DWORD extendedStatus() const; //!User status accessor + DWORD extendedtqStatus() const; //!User status accessor BYTE iconCheckSumType() const; //!Buddy icon hash type TQByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor TQString clientName() const; //! Client name and version @@ -85,7 +85,7 @@ private: 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_extendedtqStatus; /// the extended status of the contact - TLV 0x06 DWORD m_capabilities; //TLV 0x05 TQString m_clientVersion; /// the version of client they're using TQString m_clientName; /// the name of the client they're using -- cgit v1.2.1