diff options
Diffstat (limited to 'kopete/protocols/yahoo')
119 files changed, 907 insertions, 867 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp index 8ca3a4cd..384402e9 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp @@ -64,9 +64,9 @@ public: }; //! -//! Constructs a ByteStream object with parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { // kdDebug(14181) << k_funcinfo << endl; d = new Private; diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h index a990a940..c4dc96e1 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp index 1943aa6b..757f7d98 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our Status + Change our tqStatus Copyright (c) 2005-2006 André Duffeck <duffeck@kde.org> @@ -22,7 +22,7 @@ #include <kdebug.h> -ChangeStatusTask::ChangeStatusTask(Task* parent) : Task(parent) +ChangeStatusTask::ChangeStatusTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -41,7 +41,7 @@ void ChangeStatusTask::onGo() } else { - YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus ); + YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus ); t->setId( client()->sessionID() ); if( !m_message.isEmpty() ) @@ -55,7 +55,7 @@ void ChangeStatusTask::onGo() send( t ); - if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> Status + if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> tqStatus sendVisibility( Visible ); } setSuccess(); @@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg ) m_message = msg; } -void ChangeStatusTask::setStatus( Yahoo::Status status ) +void ChangeStatusTask::settqStatus( Yahoo::tqStatus status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h index 200a6f34..50a2051b 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our Status + Change our tqStatus Copyright (c) 2005 André Duffeck <duffeck@kde.org> @@ -30,18 +30,18 @@ class ChangeStatusTask : public Task { public: enum Type { Available, Away }; - ChangeStatusTask(Task *parent); + ChangeStatusTask(Task *tqparent); ~ChangeStatusTask(); virtual void onGo(); void setMessage( const TQString &msg ); - void setStatus( Yahoo::Status status ); + void settqStatus( Yahoo::tqStatus status ); void setType( Yahoo::StatusType type ); private: enum Visibility { Visible = 1, Invisible = 2 }; TQString m_message; - Yahoo::Status m_status; + Yahoo::tqStatus m_status; Yahoo::StatusType m_type; void sendVisibility( Visibility visible ); diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp index 3be83a79..6d7a987d 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <kdebug.h> -ChatSessionTask::ChatSessionTask(Task* parent) : Task(parent) +ChatSessionTask::ChatSessionTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h index eee7cdc9..e1f9f498 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h @@ -30,7 +30,7 @@ class ChatSessionTask : public Task { public: enum Type { RegisterSession, UnregisterSession }; - ChatSessionTask(Task *parent); + ChatSessionTask(Task *tqparent); ~ChatSessionTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index d2a4b8dd..df261869 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -95,10 +95,10 @@ public: TQString yCookie; TQString tCookie; TQString cCookie; - Yahoo::Status status; - Yahoo::Status statusOnConnect; + Yahoo::tqStatus status; + Yahoo::tqStatus statusOnConnect; TQString statusMessageOnConnect; - Yahoo::PictureStatus pictureFlag; + Yahoo::PicturetqStatus pictureFlag; int pictureChecksum; bool buddyListReady; TQStringList pictureRequestQueue; @@ -112,7 +112,7 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient") d->root = new Task(this, true); d->statusOnConnect = Yahoo::StatusAvailable; - setStatus( Yahoo::StatusDisconnected ); + settqStatus( Yahoo::StatusDisconnected ); d->tasksInitialized = false; d->stream = 0L; d->iconLoader = 0L; @@ -132,8 +132,8 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient") TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) ); TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ), TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) ); - TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); } Client::~Client() @@ -151,7 +151,7 @@ void Client::connect( const TQString &host, const uint port, const TQString &use d->port = port; d->user = userId; d->pass = pass; - setStatus( Yahoo::StatusConnecting ); + settqStatus( Yahoo::StatusConnecting ); m_connector = new KNetworkConnector; m_connector->setOptHostPort( host, port ); @@ -272,9 +272,9 @@ void Client::slotLoginResponse( int response, const TQString &msg ) if( !(d->statusOnConnect == Yahoo::StatusAvailable || d->statusOnConnect == Yahoo::StatusInvisible) || !d->statusMessageOnConnect.isEmpty() ) - changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); - d->statusMessageOnConnect = TQString::null; - setStatus( d->statusOnConnect ); + changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); + d->statusMessageOnConnect = TQString(); + settqStatus( d->statusOnConnect ); /* only send a ping every hour. we get disconnected otherwise */ m_pingTimer->start( 60 * 60 * 1000 ); initTasks(); @@ -344,7 +344,7 @@ void Client::sendBuzz( const TQString &to ) { SendMessageTask *smt = new SendMessageTask( d->root ); smt->setTarget( to ); - smt->setText( TQString::fromLatin1( "<ding>" ) ); + smt->setText( TQString::tqfromLatin1( "<ding>" ) ); smt->setPicureFlag( pictureFlag() ); smt->go( true ); } @@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId ) emit fileTransferCanceled( transferId ); } -void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo::StatusType type ) +void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type ) { kdDebug(YAHOO_RAW_DEBUG) << "status: " << status << " message: " << message << " type: " << type << endl; ChangeStatusTask *cst = new ChangeStatusTask( d->root ); - cst->setStatus( status ); + cst->settqStatus( status ); cst->setMessage( message ); cst->setType( type ); cst->go( true ); @@ -418,7 +418,7 @@ void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo: if( status == Yahoo::StatusInvisible ) stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear ); - setStatus( status ); + settqStatus( status ); } void Client::sendAuthReply( const TQString &userId, bool accept, const TQString &msg ) @@ -444,7 +444,7 @@ void Client::sendPing() // ***** Contactlist handling ***** -void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state) +void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state) { StealthTask *st = new StealthTask( d->root ); st->setTarget( userId ); @@ -575,16 +575,16 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url spt->go( true ); } -void Client::setPictureStatus( Yahoo::PictureStatus status ) +void Client::setPicturetqStatus( Yahoo::PicturetqStatus status ) { if( d->pictureFlag == status ) return; - kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl; + kdDebug(YAHOO_RAW_DEBUG) << "Setting PicturetqStatus to: " << status << endl; d->pictureFlag = status; SendPictureTask *spt = new SendPictureTask( d->root ); - spt->setType( SendPictureTask::SendStatus ); - spt->setStatus( status ); + spt->setType( SendPictureTask::SendtqStatus ); + spt->settqStatus( status ); spt->go( true ); } @@ -710,8 +710,8 @@ void Client::leaveChat() // ***** other ***** void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level ) { - kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") - .arg(info).arg(errorString).arg(level) << endl; + kdDebug(YAHOO_RAW_DEBUG) << TQString::tqfromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") + .tqarg(info).tqarg(errorString).tqarg(level) << endl; d->errorString = errorString; d->errorInformation = info; emit error( level ); @@ -727,18 +727,18 @@ void Client::setUserId( const TQString & userId ) d->user = userId; } -Yahoo::Status Client::status() +Yahoo::tqStatus Client::status() { return d->status; } -void Client::setStatus( Yahoo::Status status ) +void Client::settqStatus( Yahoo::tqStatus status ) { d->status = status; } -void Client::setStatusOnConnect( Yahoo::Status status ) +void Client::setStatusOnConnect( Yahoo::tqStatus status ) { d->statusOnConnect = status; } @@ -841,8 +841,8 @@ void Client::initTasks() d->statusTask = new StatusNotifierTask( d->root ); TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ), TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ), TQT_SLOT( slotLoginResponse( int, const TQString& ) ) ); TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ), diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h index ee8e1a43..9fc4825e 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.h +++ b/kopete/protocols/yahoo/libkyahoo/client.h @@ -40,9 +40,10 @@ class Task; class KTemporaryFile; struct YABEntry; -class Client : public QObject +class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -52,7 +53,7 @@ Q_OBJECT enum LogLevel { Debug, Info, Notice, Warning, Error, Critical }; - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); /** @@ -99,7 +100,7 @@ Q_OBJECT * If status is any other status the Client connects into Online state and changes into the specified state after the login. * @param status the status to connect with */ - void setStatusOnConnect( Yahoo::Status status ); + void setStatusOnConnect( Yahoo::tqStatus status ); /** * Specifies the status message we connect with. @@ -146,7 +147,7 @@ Q_OBJECT * @param message the status message that will be set * @param type Yahoo::StatusTypeAvailable means that the user is available, Yahoo::StatusTypeAway means that the user is away from the keyboard */ - void changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type); + void changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type); /** * Set the verification word that is needed for a account verification after @@ -161,7 +162,7 @@ Q_OBJECT * @param group the group where the buddy will be placed * @param message the message that will be sent to the buddy along the authorization request */ - void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::fromLatin1("Please add me") ); + void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::tqfromLatin1("Please add me") ); /** * Remove a buddy from the contact list @@ -184,7 +185,7 @@ Q_OBJECT * @param mode defines the Stealth mode that is changed. That can be "Appear Offline", "Appear Online" or "Apper permanently offline" * @param state the status of the specified Stealth mode. Active, Not Active or Clear */ - void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state ); + void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state ); /** * Request the buddy's picture @@ -225,7 +226,7 @@ Q_OBJECT * Notify the buddies about our new status * @param flag the type of our picture (0=none, 1=avatar, 2=picture) */ - void setPictureStatus( Yahoo::PictureStatus flag ); + void setPicturetqStatus( Yahoo::PicturetqStatus flag ); /** * Send a response to the webcam invite ( Accept / Decline ) @@ -431,13 +432,13 @@ Q_OBJECT int pictureChecksum(); /** Get our status */ - Yahoo::Status status(); + Yahoo::tqStatus status(); /** * Set our status * @param status the new status */ - void setStatus( Yahoo::Status status ); + void settqStatus( Yahoo::tqStatus status ); /** Access the root Task for this client, so tasks may be added to it. */ Task* rootTask(); @@ -502,7 +503,7 @@ Q_OBJECT /** * Notifies about the stealth status of buddies */ - void stealthStatusChanged( const TQString &, Yahoo::StealthStatus ); + void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus ); /** * Notifies about mails */ diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp index 59d3b3fa..105d9de6 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include <kdebug.h> -ConferenceTask::ConferenceTask(Task* parent) : Task(parent) +ConferenceTask::ConferenceTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -178,7 +178,7 @@ void ConferenceTask::addInvite( const TQString &room, const TQStringList &who, c TQString whoList = who.first(); for( int i = 1; i < who.size(); i++ ) - whoList += TQString(",%1").arg( who[i] ); + whoList += TQString(",%1").tqarg( who[i] ); t->setParam( 51, whoList.local8Bit() ); t->setParam( 57, room.local8Bit() ); diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h index 5f027c0f..aff52228 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h @@ -27,8 +27,9 @@ class YMSGTransfer; class ConferenceTask : public Task { Q_OBJECT + TQ_OBJECT public: - ConferenceTask(Task *parent); + ConferenceTask(Task *tqparent); ~ConferenceTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/connector.cpp b/kopete/protocols/yahoo/libkyahoo/connector.cpp index cc7dcfa3..36912011 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setPeerAddressNone(); } @@ -40,7 +40,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -52,7 +52,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; diff --git a/kopete/protocols/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h index 02b47019..f5b1917a 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.h +++ b/kopete/protocols/yahoo/libkyahoo/connector.h @@ -27,11 +27,12 @@ class ByteStream; -class Connector : public QObject +class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -40,7 +41,7 @@ public: bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -48,12 +49,12 @@ signals: protected: void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp index 573c5ccf..c9c5828b 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp @@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef YAHOO_COREPROTOCOL_DEBUG - kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl; + kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl; TQTextStream s( wire, IO_ReadOnly ); TQString remaining = s.read(); - int pos = remaining.find( "YMSG", bytesParsed ); + int pos = remaining.tqfind( "YMSG", bytesParsed ); if( pos >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h index c1c05d89..fc4c2be6 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h @@ -27,9 +27,10 @@ class Transfer; class YMSGProtocol; -class CoreProtocol : public QObject +class CoreProtocol : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State { NeedMore, Available, NoData, OutOfSync }; diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c index ee15c345..76620bc4 100644 --- a/kopete/protocols/yahoo/libkyahoo/crypt.c +++ b/kopete/protocols/yahoo/libkyahoo/crypt.c @@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$"; /* Table with characters for base64 transformation. */ static const char b64t[64] = -"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; char *yahoo_crypt(const char *key, const char *salt); diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp index fd9657f7..10056a61 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> //#include <kcodecs.h> -FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent) +FileTransferNotifierTask::FileTransferNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t ) return; - unsigned int left = url.findRev( '/' ) + 1; - unsigned int right = url.findRev( '?' ); + unsigned int left = url.tqfindRev( '/' ) + 1; + unsigned int right = url.tqfindRev( '?' ); filename = url.mid( left, right - left ); emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() ); diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h index 429c3668..84b50849 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h @@ -30,8 +30,9 @@ class TQPixmap; class FileTransferNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - FileTransferNotifierTask(Task *parent); + FileTransferNotifierTask(Task *tqparent); ~FileTransferNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp index 15c3b078..53068b58 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp @@ -19,8 +19,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) - : TQObject(parent, name) +InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -64,11 +64,11 @@ bool InputProtocolBase::okToProceed() bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) { // read the length of the bytes - Q_UINT32 val; + TQ_UINT32 val; if ( !okToProceed() ) return false; *m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); if ( val > 1024 ) return false; //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h index e236bc68..3c610cdf 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h @@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se @author Kopete Developers */ -class InputProtocolBase : public QObject +class InputProtocolBase : public TQObject { Q_OBJECT + TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *parent = 0, const char *name = 0); + InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c index a97e7be7..56b5f968 100644 --- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c +++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c @@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *); void yahooBase64(unsigned char *out, const unsigned char *in, int inlen) /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */ { - char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + char base64digits[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789._"; @@ -152,7 +152,7 @@ void authresp_0x0b(const char *seed, const char *sn, const char *password, char while (*magic_ptr != (int)NULL) { const char *loc; - /* Ignore parentheses. */ + /* Ignore tqparentheses. */ if (*magic_ptr == '(' || *magic_ptr == ')') { magic_ptr++; diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.cpp b/kopete/protocols/yahoo/libkyahoo/listtask.cpp index d299f963..a368ac5b 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/listtask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -ListTask::ListTask(Task* parent) : Task(parent) +ListTask::ListTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h index 067868a2..2c487c0c 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.h +++ b/kopete/protocols/yahoo/libkyahoo/listtask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class ListTask : public Task { Q_OBJECT + TQ_OBJECT public: - ListTask(Task *parent); + ListTask(Task *tqparent); ~ListTask(); bool take(Transfer *transfer); @@ -40,7 +41,7 @@ protected: void parseStealthList( YMSGTransfer *transfer ); signals: void gotBuddy(const TQString&, const TQString&, const TQString&); - void stealthStatusChanged( const TQString&, Yahoo::StealthStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 3c3127b2..439b39f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -37,7 +37,7 @@ extern "C" #include "libyahoo.h" } -LoginTask::LoginTask(Task* parent) : Task(parent) +LoginTask::LoginTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; mState = InitialState; @@ -209,10 +209,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) { const TQString YahooTokenUrl = "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3"; kdDebug(YAHOO_RAW_DEBUG) << "seed:" << seed << endl; - m_stage1Data= TQString::null; + m_stage1Data= TQString(); /* construct a URL from the seed and request tokens */ TQByteArray encodedUrl; - TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); + TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); KIO::Job* job = KIO::get(tokenUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -291,8 +291,8 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) { const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1"; kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl; - m_stage2Data = TQString::null; - TQString fullUrl = YahooLoginUrl.arg(token); + m_stage2Data = TQString(); + TQString fullUrl = YahooLoginUrl.tqarg(token); KURL loginUrl(fullUrl); KIO::Job* job = KIO::get(loginUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -353,15 +353,15 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString) { kdDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString << endl; - //TQByteArray cryptStringHash = QCryptographicHash::hash( cryptString.toAscii(), - // QCryptographicHash::Md5 ); + //TQByteArray cryptStringHash = TQCryptographicHash::hash( cryptString.toAscii(), + // TQCryptographicHash::Md5 ); //cryptStringHash = cryptStringHash.toBase64(); TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest(); - cryptStringHash = cryptStringHash.replace('+', '.'); - cryptStringHash = cryptStringHash.replace('/', '_'); - cryptStringHash = cryptStringHash.replace('=', '-'); + cryptStringHash = cryptStringHash.tqreplace('+', '.'); + cryptStringHash = cryptStringHash.tqreplace('/', '_'); + cryptStringHash = cryptStringHash.tqreplace('=', '-'); YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect); t->setId( m_sessionID ); @@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t) mState = InitialState; } -void LoginTask::setStateOnConnect( Yahoo::Status status ) +void LoginTask::setStateOnConnect( Yahoo::tqStatus status ) { m_stateOnConnect = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h index eb2e8fc9..88fc53d3 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.h +++ b/kopete/protocols/yahoo/libkyahoo/logintask.h @@ -38,15 +38,16 @@ namespace KIO class LoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - LoginTask(Task *parent); + LoginTask(Task *tqparent); ~LoginTask(); bool take(Transfer* transfer); virtual void onGo(); void reset(); - void setStateOnConnect( Yahoo::Status status ); + void setStateOnConnect( Yahoo::tqStatus status ); void setVerificationWord( const TQString &word ); const TQString &yCookie(); @@ -79,7 +80,7 @@ signals: void buddyListReady(); private: State mState; - Yahoo::Status m_stateOnConnect; + Yahoo::tqStatus m_stateOnConnect; TQString m_yCookie; TQString m_tCookie; TQString m_cCookie; diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp index 4816ba44..07fc1ae4 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <kdebug.h> -LogoffTask::LogoffTask(Task* parent) : Task(parent) +LogoffTask::LogoffTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.h b/kopete/protocols/yahoo/libkyahoo/logofftask.h index b04f8f53..af29512a 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.h +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.h @@ -26,7 +26,7 @@ class LogoffTask : public Task { public: - LogoffTask(Task *parent); + LogoffTask(Task *tqparent); ~LogoffTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index de6a1080..4c86bb20 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -MailNotifierTask::MailNotifierTask(Task* parent) : Task(parent) +MailNotifierTask::MailNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t ) TQString subject = t->firstParam( 18 ); if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() ) - emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() ); + emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); else emit mailNotify( TQString(), TQString(), count.toInt()); } diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h index 0e1d6028..7faba303 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class MailNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - MailNotifierTask(Task *parent); + MailNotifierTask(Task *tqparent); ~MailNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c index 5a537e04..5bc2c13b 100644 --- a/kopete/protocols/yahoo/libkyahoo/md5.c +++ b/kopete/protocols/yahoo/libkyahoo/md5.c @@ -69,7 +69,7 @@ main() "abc", /*900150983cd24fb0d6963f7d28e17f72*/ "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", /*d174ab98d277d9f5a5611c2c9f419d9f*/ "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ }; diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp index 769b4abe..522f407f 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include <kdebug.h> -MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent) +MessageReceiverTask::MessageReceiverTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h index 80c4fa44..459b851e 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class MessageReceiverTask : public Task { Q_OBJECT + TQ_OBJECT public: - MessageReceiverTask(Task *parent); + MessageReceiverTask(Task *tqparent); ~MessageReceiverTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp index e83b1e4b..84b7f012 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -ModifyBuddyTask::ModifyBuddyTask(Task* parent) : Task(parent) +ModifyBuddyTask::ModifyBuddyTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h index 1d2393a6..3d353086 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h @@ -27,9 +27,10 @@ class TQString; class ModifyBuddyTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { AddBuddy, RemoveBuddy, MoveBuddy }; - ModifyBuddyTask(Task *parent); + ModifyBuddyTask(Task *tqparent); ~ModifyBuddyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 1264272a..b456746a 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -31,7 +31,7 @@ #include <kbufferedsocket.h> using namespace KNetwork; -ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent) +ModifyYABTask::ModifyYABTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; m_socket = 0; @@ -68,7 +68,7 @@ void ModifyYABTask::setEntry( const YABEntry &entry ) doc.appendChild( root ); TQDomElement contact = doc.createElement( "ct" ); - entry.fillQDomElement( contact ); + entry.fillTQDomElement( contact ); switch( m_action ) { case EditEntry: @@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i) { m_socket->close(); client()->notifyError( i18n( "An error occurred while saving the address book entry." ), - TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->errorString()), Client::Error ); + TQString( "%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() @@ -99,14 +99,14 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) ; KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) ); - TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" + TQString header = TQString::tqfromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" "Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n" "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: address.yahoo.com\r\n" "Content-length: %4\r\n" "Cache-Control: no-cache\r\n\r\n") - .arg(client()->yCookie()).arg(client()->tCookie()) - .arg(client()->cCookie()).arg(m_postData.utf8().size()); + .tqarg(client()->yCookie()).tqarg(client()->tCookie()) + .tqarg(client()->cCookie()).tqarg(m_postData.utf8().size()); TQByteArray buffer; TQByteArray paket; @@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl; else { - client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->errorString(), Client::Error ); + client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error ); setError(); return; } @@ -132,9 +132,9 @@ void ModifyYABTask::slotRead() TQByteArray ar( socket->bytesAvailable() ); socket->readBlock( ar.data (), ar.size () ); TQString data( ar ); - data = data.right( data.length() - data.find("<?xml") ); + data = data.right( data.length() - data.tqfind("<?xml") ); - if( m_data.find("</ab>") < 0 ) + if( m_data.tqfind("</ab>") < 0 ) return; // Need more data m_socket->close(); @@ -166,7 +166,7 @@ void ModifyYABTask::slotRead() e = list.item( it ).toElement(); YABEntry *entry = new YABEntry; - entry->fromQDomElement( e ); + entry->fromTQDomElement( e ); entry->source = YABEntry::SourceYAB; switch( m_action ) @@ -174,21 +174,21 @@ void ModifyYABTask::slotRead() case EditEntry: if( !e.attribute( "es" ).isEmpty() && e.attribute( "es" ) != "0" ) // Check for edit errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( e.attribute("ee") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) ); continue; } break; case AddEntry: if( !e.attribute( "as" ).isEmpty() && e.attribute( "as" ) != "0" ) // Check for add errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( e.attribute("ae") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) ); continue; } break; case DeleteEntry: if( !e.attribute( "ds" ).isEmpty() && e.attribute( "ds" ) != "0" ) // Check for delete errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) ); continue; } break; diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h index 543b582c..ef1a97eb 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h @@ -35,9 +35,10 @@ namespace KNetwork { class ModifyYABTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Action { AddEntry, EditEntry, DeleteEntry }; - ModifyYABTask(Task *parent); + ModifyYABTask(Task *tqparent); ~ModifyYABTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp index d924b3a6..cf7a6e34 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp @@ -25,7 +25,7 @@ #include <klocale.h> -PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent) +PictureNotifierTask::PictureNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer ) switch( t->service() ) { - case Yahoo::ServicePictureStatus: - parsePictureStatus( t ); + case Yahoo::ServicePicturetqStatus: + parsePicturetqStatus( t ); parsePicture( t ); break; case Yahoo::ServicePictureChecksum: @@ -80,17 +80,17 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const t->service() == Yahoo::ServicePicture || t->service() == Yahoo::ServicePictureUpdate || t->service() == Yahoo::ServicePictureUpload || - t->service() == Yahoo::ServicePictureStatus ) + t->service() == Yahoo::ServicePicturetqStatus ) return true; else return false; } -void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t ) +void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int state; /* key = 213 */ nick = t->firstParam( 4 ); @@ -103,7 +103,7 @@ void PictureNotifierTask::parsePictureChecksum( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int checksum; /* key = 192 */ nick = t->firstParam( 4 ); @@ -117,7 +117,7 @@ void PictureNotifierTask::parsePicture( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int type; /* key = 13: 1 = request, 2 = notification, 0 = Just changed */ TQString url; /* key = 20 */ int checksum; /* key = 192 */ diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h index 22bbaddb..bfd03303 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h @@ -29,8 +29,9 @@ class YMSGTransfer; class PictureNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - PictureNotifierTask(Task *parent); + PictureNotifierTask(Task *tqparent); ~PictureNotifierTask(); bool take(Transfer *transfer); @@ -38,7 +39,7 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; void parsePictureChecksum( YMSGTransfer *transfer ); - void parsePictureStatus( YMSGTransfer *transfer ); + void parsePicturetqStatus( YMSGTransfer *transfer ); void parsePicture( YMSGTransfer *transfer ); void parsePictureUploadResponse( YMSGTransfer *transfer ); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp index c453ff9d..25b80abe 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <kdebug.h> -PingTask::PingTask(Task* parent) : Task(parent) +PingTask::PingTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.h b/kopete/protocols/yahoo/libkyahoo/pingtask.h index f1c2f6a7..47453709 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.h +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.h @@ -27,7 +27,7 @@ class PingTask : public Task { public: - PingTask(Task *parent); + PingTask(Task *tqparent); ~PingTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index ec2e9f5f..a614f0b8 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -28,7 +28,7 @@ #include <kio/job.h> #include <kio/jobclasses.h> -ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) +ReceiveFileTask::ReceiveFileTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; @@ -187,20 +187,20 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) send( t ); // The server expects a HTTP HEAD command prior to the GET - m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false); + m_mimetypeJob = KIO::mimetype(TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false); m_mimetypeJob->addMetaData("cookies", "manual"); - m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") - .arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) ); + m_mimetypeJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") + .tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) ); - m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); + m_transferJob = KIO::get( TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") + .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false ); TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); - m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") - .arg(client()->tCookie()).arg(client()->yCookie()) ); + m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") + .tqarg(client()->tCookie()).tqarg(client()->yCookie()) ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h index ac828658..93f3261e 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h @@ -36,9 +36,10 @@ class YMSGTransfer; class ReceiveFileTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject }; - ReceiveFileTask(Task *parent); + ReceiveFileTask(Task *tqparent); ~ReceiveFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp index 55fb046e..59173389 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -RequestPictureTask::RequestPictureTask(Task* parent) : Task(parent) +RequestPictureTask::RequestPictureTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h index eccaa652..d2a901bb 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h @@ -27,8 +27,9 @@ class TQString; class RequestPictureTask : public Task { Q_OBJECT + TQ_OBJECT public: - RequestPictureTask(Task *parent); + RequestPictureTask(Task *tqparent); virtual ~RequestPictureTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp index 0b12c370..714b0960 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp @@ -63,13 +63,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.h b/kopete/protocols/yahoo/libkyahoo/safedelete.h index ded0cb31..8e6d5abd 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.h +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.h @@ -57,9 +57,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp index 34e94c69..1f23a40b 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <kdebug.h> -SendAuthRespTask::SendAuthRespTask(Task* parent) : Task(parent) +SendAuthRespTask::SendAuthRespTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h index cbdadf48..8740cf50 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h @@ -28,8 +28,9 @@ class TQString; class SendAuthRespTask : public Task { Q_OBJECT + TQ_OBJECT public: - SendAuthRespTask(Task *parent); + SendAuthRespTask(Task *tqparent); ~SendAuthRespTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index 48af8684..11844cd8 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -29,7 +29,7 @@ using namespace KNetwork; -SendFileTask::SendFileTask(Task* parent) : Task(parent) +SendFileTask::SendFileTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; @@ -205,7 +205,7 @@ void SendFileTask::connectSucceeded() } else { - kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString().data() << endl; client()->notifyError( i18n( "An error occurred while sending the file." ), m_file.errorString(), Client::Error ); setError(); return; @@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded() if( !m_socket->writeBlock( buffer, buffer.size() ) ) { - emit error( m_transferId, m_socket->error(), m_socket->errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); m_socket->close(); } else @@ -255,7 +255,7 @@ void SendFileTask::transmitData() if( written != read ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl; - emit error( m_transferId, m_socket->error(), m_socket->errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); setError(); return; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h index c9052125..49f7fbaf 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h @@ -32,8 +32,9 @@ namespace KNetwork{ class SendFileTask : public Task { Q_OBJECT + TQ_OBJECT public: - SendFileTask(Task *parent); + SendFileTask(Task *tqparent); ~SendFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp index 828c6832..438c330f 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <klocale.h> -SendMessageTask::SendMessageTask(Task* parent) : Task(parent) +SendMessageTask::SendMessageTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h index e21d9029..52846a3d 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h @@ -27,7 +27,7 @@ class TQString; class SendMessageTask : public Task { public: - SendMessageTask(Task *parent); + SendMessageTask(Task *tqparent); ~SendMessageTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp index 638a1811..00055725 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> -SendNotifyTask::SendNotifyTask(Task* parent) : Task(parent) +SendNotifyTask::SendNotifyTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } @@ -35,7 +35,7 @@ void SendNotifyTask::onGo() { YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify); t->setId( client()->sessionID() ); - t->setStatus( Yahoo::StatusNotify ); + t->settqStatus( Yahoo::StatusNotify ); switch( m_type ) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h index d235e858..b4e84658 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h @@ -27,11 +27,12 @@ class TQString; class SendNotifyTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame }; enum State { Active = 1, NotActive = 0 }; - SendNotifyTask(Task *parent); + SendNotifyTask(Task *tqparent); ~SendNotifyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index ab10873a..32500f1c 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -31,7 +31,7 @@ using namespace KNetwork; -SendPictureTask::SendPictureTask(Task* parent) : Task(parent) +SendPictureTask::SendPictureTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_socket = 0; @@ -55,8 +55,8 @@ void SendPictureTask::onGo() case SendInformation: sendInformation(); break; - case SendStatus: - sendStatus(); + case SendtqStatus: + sendtqStatus(); break; } } @@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload() void SendPictureTask::connectFailed( int i) { - kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); setError(); } @@ -104,22 +104,22 @@ void SendPictureTask::connectSucceeded() } else { - kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString() << endl; - client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error ); + kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString().data() << endl; + client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error ); return; } paket = t.serialize(); kdDebug(YAHOO_RAW_DEBUG) << "Sizes: File (" << m_path << "): " << file.size() << " - paket: " << paket.size() << endl; - TQString header = TQString::fromLatin1("POST /notifyft HTTP/1.1\r\n" + TQString header = TQString::tqfromLatin1("POST /notifyft HTTP/1.1\r\n" "Cookie: Y=%1; T=%2; C=%3 ;\r\n" "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: filetransfer.msg.yahoo.com\r\n" "Content-length: %4\r\n" - "Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size()); + "Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size()); stream.writeRawBytes( header.local8Bit(), header.length() ); stream.writeRawBytes( paket.data(), paket.size() ); - stream << (Q_INT8)0x32 << (Q_INT8)0x39 << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80; stream.writeRawBytes( file.readAll(), file.size() ); kdDebug(YAHOO_RAW_DEBUG) << "Buffersize: " << buffer.size() << endl; @@ -163,7 +163,7 @@ void SendPictureTask::readResult() TQString buf( ar ); m_socket->close(); - if( buf.find( "error", 0, false ) >= 0 ) + if( buf.tqfind( "error", 0, false ) >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl; setSuccess( false ); @@ -208,11 +208,11 @@ void SendPictureTask::sendInformation() setSuccess(); } -void SendPictureTask::sendStatus() +void SendPictureTask::sendtqStatus() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus); + YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus); t->setId( client()->sessionID() ); t->setParam(3, client()->userId().local8Bit()); t->setParam(213, m_status ); @@ -252,7 +252,7 @@ void SendPictureTask::setChecksum( int checksum ) m_checksum = checksum; } -void SendPictureTask::setStatus( int status ) +void SendPictureTask::settqStatus( int status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index dc20a34c..40e80378 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -35,10 +35,11 @@ namespace KNetwork { class SendPictureTask : public Task { Q_OBJECT + TQ_OBJECT public: - enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus }; + enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus }; - SendPictureTask(Task *parent); + SendPictureTask(Task *tqparent); virtual ~SendPictureTask(); virtual void onGo(); @@ -49,13 +50,13 @@ public: void setFilesize( int ); void setPath( const TQString & ); void setChecksum( int ); - void setStatus( int ); + void settqStatus( int ); void setUrl( const TQString & ); private: void initiateUpload(); void sendChecksum(); void sendInformation(); - void sendStatus(); + void sendtqStatus(); private slots: void connectSucceeded(); void connectFailed( int ); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index 35796666..3d0802d1 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <klocale.h> -StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent) +StatusNotifierTask::StatusNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer ) YMSGTransfer *t = static_cast<YMSGTransfer*>(transfer); if( t->service() == Yahoo::ServiceStealthOffline ) - parseStealthStatus( t ); + parseStealthtqStatus( t ); else if( t->service() == Yahoo::ServiceAuthorization ) parseAuthorization( t ); else - parseStatus( t ); + parsetqStatus( t ); return true; } @@ -67,17 +67,17 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const t->service() == Yahoo::ServiceGameLogoff || t->service() == Yahoo::ServiceIdAct || t->service() == Yahoo::ServiceIddeAct || - t->service() == Yahoo::ServiceStatus || + t->service() == Yahoo::ServicetqStatus || t->service() == Yahoo::ServiceStealthOffline || t->service() == Yahoo::ServiceAuthorization || - t->service() == Yahoo::ServiceBuddyStatus + t->service() == Yahoo::ServiceBuddytqStatus ) return true; else return false; } -void StatusNotifierTask::parseStatus( YMSGTransfer* t ) +void StatusNotifierTask::parsetqStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -87,7 +87,7 @@ void StatusNotifierTask::parseStatus( YMSGTransfer* t ) emit loginResponse( Yahoo::LoginDupl, TQString() ); } - QString myNick; /* key = 1 */ + TQString myNick; /* key = 1 */ TQString customError; /* key = 16 */ TQString nick; /* key = 7 */ int state; /* key = 10 */ @@ -156,14 +156,14 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t ) TQString lname = t->firstParam( 254 ); TQString name; if( !fname.isEmpty() || !lname.isEmpty() ) - name = TQString("%1 %2").arg(fname).arg(lname); + name = TQString("%1 %2").tqarg(fname).tqarg(lname); kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl; emit gotAuthorizationRequest( nick, msg, name ); } } -void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t ) +void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 0d9e1d5a..62668947 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -29,20 +29,21 @@ class YMSGTransfer; class StatusNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - StatusNotifierTask(Task *parent); + StatusNotifierTask(Task *tqparent); ~StatusNotifierTask(); bool take(Transfer *transfer); protected: virtual bool forMe( const Transfer *transfer ) const; - void parseStatus( YMSGTransfer *transfer ); - void parseStealthStatus( YMSGTransfer *transfer ); + void parsetqStatus( YMSGTransfer *transfer ); + void parseStealthtqStatus( YMSGTransfer *transfer ); void parseAuthorization( YMSGTransfer *transfer ); signals: void statusChanged( const TQString &nick, int state, const TQString &message, int away, int idle, int pictureChecksum ); - void stealthStatusChanged( const TQString&, Yahoo::StealthStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); void loginResponse( int, const TQString& ); void authorizationAccepted( const TQString & ); void authorizationRejected( const TQString &, const TQString & ); diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp index 6eba854a..ee9bb6d3 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp @@ -21,7 +21,7 @@ #include "client.h" #include <tqstring.h> -StealthTask::StealthTask(Task* parent) : Task(parent) +StealthTask::StealthTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to ) m_target = to; } -void StealthTask::setState( Yahoo::StealthStatus state) +void StealthTask::setState( Yahoo::StealthtqStatus state) { m_state = state; } diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h index 370f06bc..6a1b0b2e 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h @@ -29,18 +29,18 @@ class TQString; class StealthTask : public Task { public: - StealthTask(Task *parent); + StealthTask(Task *tqparent); ~StealthTask(); virtual void onGo(); void setTarget( const TQString &to ); - void setState( Yahoo::StealthStatus state ); + void setState( Yahoo::StealthtqStatus state ); void setMode( Yahoo::StealthMode mode ); private: TQString m_target; Yahoo::StealthMode m_mode; - Yahoo::StealthStatus m_state; + Yahoo::StealthtqStatus m_state; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/stream.cpp b/kopete/protocols/yahoo/libkyahoo/stream.cpp index 82d6fe52..240a8144 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h index c7f9eeae..244519f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.h +++ b/kopete/protocols/yahoo/libkyahoo/stream.h @@ -25,9 +25,10 @@ class Transfer; -class Stream : public QObject +class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond @@ -43,7 +44,7 @@ public: SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index b604219b..c17568ee 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -40,22 +40,22 @@ public: Transfer * transfer; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); d->transfer = 0; - d->client = parent->client(); + d->client = tqparent->client(); //d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *parent, bool) +Task::Task(Client *tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->transfer = 0; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -124,12 +124,12 @@ void Task::go(bool autoDelete) bool Task::take( Transfer * transfer) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; - // pass along the transfer to our children - TQObjectListIt it(*p); + // pass along the transfer to our tqchildren + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -252,7 +252,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &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/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h index c977f3bc..fcdaf9ef 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.h +++ b/kopete/protocols/yahoo/libkyahoo/task.h @@ -27,16 +27,17 @@ class TQString; class Client; class Transfer; -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task( Client *, bool isRoot ); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Client *client() const; Transfer *transfer() const; diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp index efcd63cf..6d8d9e0d 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp @@ -30,7 +30,7 @@ ClientStreamTest::~ClientStreamTest() void ClientStreamTest::slotDoTest() { - TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; myTestObject->connectToServer( server, true ); // fine up to here... diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h index 8842fcc2..e09c89bb 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h @@ -19,11 +19,12 @@ #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class ClientStreamTest : public QApplication +class ClientStreamTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: ClientStreamTest(int argc, char ** argv); diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index 5e9b04a5..ecf96906 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp @@ -46,7 +46,7 @@ LoginTest::~LoginTest() void LoginTest::slotDoTest() { - TQString server = TQString::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h index 68a40b24..1fd43976 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h @@ -32,11 +32,12 @@ #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class LoginTest : public QApplication +class LoginTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: LoginTest(int argc, char ** argv); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 2ad978f2..41d5019d 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -33,7 +33,7 @@ using namespace KNetwork; -WebcamTask::WebcamTask(Task* parent) : Task(parent) +WebcamTask::WebcamTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; transmittingData = false; @@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t ) info.sender = keyPending; info.server = t->firstParam( 102 ); info.key = t->firstParam( 61 ); - info.status = InitialStatus; + info.status = InitialtqStatus; info.dataLength = 0; info.buffer = 0L; info.headerRead = false; @@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established() if( socketMap[socket].direction == Incoming ) { socket->writeBlock( TQCString("<RVWCFG>").data(), 8 ); - s = TQString("g=%1\r\n").arg(socketMap[socket].sender); + s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender); } else { @@ -144,7 +144,7 @@ void WebcamTask::slotConnectionStage1Established() } // Header: 08 00 01 00 00 00 00 - stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length(); + stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); stream.writeRawBytes( s.local8Bit(), s.length() ); socket->writeBlock( buffer.data(), buffer.size() ); @@ -168,24 +168,24 @@ void WebcamTask::slotConnectionStage2Established() if( socketMap[socket].direction == Incoming ) { - // Send <REQIMG>-Packet - socket->writeBlock( TQCString("<REQIMG>").data(), 8 ); + // Send <RETQIMG>-Packet + socket->writeBlock( TQCString("<RETQIMG>").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\ne=21\r\nu=%1\r\nt=%2\r\ni=\r\ng=%3\r\no=w-2-5-1\r\np=1") - .arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender); + .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender); // Header: 08 00 01 00 00 00 00 - stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length(); + stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); } else { - // Send <REQIMG>-Packet + // Send <RETQIMG>-Packet socket->writeBlock( TQCString("<SNDIMG>").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\nu=%1\r\nt=%2\r\ni=%3\r\no=w-2-5-1\r\np=2\r\nb=KopeteWebcam\r\nd=\r\n") - .arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName()); + .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName()); // Header: 08 00 05 00 00 00 00 01 00 00 00 01 - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)s.length() - << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01; + stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)s.length() + << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; } socket->writeBlock( buffer.data(), buffer.size() ); @@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established() void WebcamTask::slotConnectionFailed( int error ) { KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) ); - kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl; client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.") - .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->errorString()), Client::Error ); + .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error ); socketMap.remove( socket ); socket->deleteLater(); } @@ -237,12 +237,12 @@ void WebcamTask::connectStage2( KStreamSocket *socket ) KStreamSocket *newSocket; switch( (const char)data[2] ) { - case (Q_INT8)0x06: + case (TQ_INT8)0x06: emit webcamNotAvailable(socketMap[socket].sender); break; - case (Q_INT8)0x04: - case (Q_INT8)0x07: - while( (const char)data[i] != (Q_INT8)0x00 ) + case (TQ_INT8)0x04: + case (TQ_INT8)0x07: + while( (const char)data[i] != (TQ_INT8)0x00 ) server += data[i++]; kdDebug(YAHOO_RAW_DEBUG) << "Server:" << server << endl; if( server.isEmpty() ) @@ -355,7 +355,7 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) // Send Invitation packets for(it = pendingInvitations.begin(); it != pendingInvitations.end(); it++) { - SendNotifyTask *snt = new SendNotifyTask( parent() ); + SendNotifyTask *snt = new SendNotifyTask( tqparent() ); snt->setTarget( *it ); snt->setType( SendNotifyTask::NotifyWebcamInvite ); snt->go( true ); @@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) case UserRequest: { who.append( info->buffer->buffer() ); - who = who.mid( 2, who.find('\n') - 3); - kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl; - if( accessGranted.findIndex( who ) >= 0 ) + who = who.mid( 2, who.tqfind('\n') - 3); + kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl; + if( accessGranted.tqfindIndex( who ) >= 0 ) { grantAccess( who ); } @@ -579,10 +579,10 @@ void WebcamTask::grantAccess( const TQString &userId ) } TQByteArray ar; TQDataStream stream( ar, IO_WriteOnly ); - TQString user = TQString("u=%1").arg(userId); + TQString user = TQString("u=%1").tqarg(userId); - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)user.length() - << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01; + stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)user.length() + << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; socket->writeBlock( ar.data(), ar.size() ); socket->writeBlock( user.local8Bit(), user.length() ); } @@ -689,8 +689,8 @@ void WebcamTask::transmitWebcamImage() socket->enableWrite( false ); TQByteArray buffer; TQDataStream stream( buffer, IO_WriteOnly ); - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)pictureBuffer.size() - << (Q_INT8)0x02 << (Q_INT32)timestamp++; + stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)pictureBuffer.size() + << (TQ_INT8)0x02 << (TQ_INT32)timestamp++; socket->writeBlock( buffer.data(), buffer.size() ); if( pictureBuffer.size() ) socket->writeBlock( pictureBuffer.data(), pictureBuffer.size() ); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h index 7c232642..db3756ff 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h @@ -30,21 +30,21 @@ namespace KNetwork { } using namespace KNetwork; -enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; +enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft }; enum Direction { Incoming, Outgoing }; struct YahooWebcamInformation { - QString sender; - QString server; - QString key; - ConnectionStatus status; + TQString sender; + TQString server; + TQString key; + ConnectiontqStatus status; PacketType type; Direction direction; uchar reason; - Q_INT32 dataLength; - Q_INT32 timestamp; + TQ_INT32 dataLength; + TQ_INT32 timestamp; bool headerRead; TQBuffer *buffer; }; @@ -57,8 +57,9 @@ typedef TQMap< KStreamSocket *, YahooWebcamInformation > SocketInfoMap; class WebcamTask : public Task { Q_OBJECT + TQ_OBJECT public: - WebcamTask(Task *parent); + WebcamTask(Task *tqparent); ~WebcamTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index b9a4d72b..cee71da6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -16,7 +16,7 @@ #include "yabentry.h" -void YABEntry::fromQDomElement( const TQDomElement &e ) +void YABEntry::fromTQDomElement( const TQDomElement &e ) { yahooId = e.attribute("yi"); YABId = e.attribute("id", "-1").toInt(); @@ -36,13 +36,13 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) privateURL = e.attribute("pu"); title = e.attribute("ti"); corporation = e.attribute("co"); - workAdress = e.attribute("wa").replace( "
", "\n" ); + workAdress = e.attribute("wa").tqreplace( "
", "\n" ); workCity = e.attribute("wc"); workState = e.attribute("ws"); workZIP = e.attribute("wz"); workCountry = e.attribute("wn"); workURL = e.attribute("wu"); - privateAdress = e.attribute("ha").replace( "
", "\n" ); + privateAdress = e.attribute("ha").tqreplace( "
", "\n" ); privateCity = e.attribute("hc"); privateState = e.attribute("hs"); privateZIP = e.attribute("hz"); @@ -55,7 +55,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) additional2 = e.attribute("c2"); additional3 = e.attribute("c3"); additional4 = e.attribute("c4"); - notes = e.attribute("cm").replace( "
", "\n" ); + notes = e.attribute("cm").tqreplace( "
", "\n" ); imAIM = e.attribute("ima"); imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); @@ -65,7 +65,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) imSkype = e.attribute("imk"); } -void YABEntry::fromQDomDocument( const TQDomDocument &d ) +void YABEntry::fromTQDomDocument( const TQDomDocument &d ) { kdDebug() << d.toString() << d.elementsByTagName("yi").item(0).toElement().text() << endl; @@ -86,13 +86,13 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) privateURL = d.elementsByTagName("pu").item(0).toElement().text(); title = d.elementsByTagName("ti").item(0).toElement().text(); corporation = d.elementsByTagName("co").item(0).toElement().text(); - workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( "
", "\n" ); + workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( "
", "\n" ); workCity = d.elementsByTagName("wc").item(0).toElement().text(); workState = d.elementsByTagName("ws").item(0).toElement().text(); workZIP = d.elementsByTagName("wz").item(0).toElement().text(); workCountry = d.elementsByTagName("wn").item(0).toElement().text(); workURL = d.elementsByTagName("wu").item(0).toElement().text(); - privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( "
", "\n" ); + privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( "
", "\n" ); privateCity = d.elementsByTagName("hc").item(0).toElement().text(); privateState = d.elementsByTagName("hs").item(0).toElement().text(); privateZIP = d.elementsByTagName("hz").item(0).toElement().text(); @@ -105,7 +105,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) additional2 = d.elementsByTagName("c2").item(0).toElement().text(); additional3 = d.elementsByTagName("c3").item(0).toElement().text(); additional4 = d.elementsByTagName("c4").item(0).toElement().text(); - notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "
", "\n" ); + notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( "
", "\n" ); imAIM = d.elementsByTagName("ima").item(0).toElement().text(); imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); @@ -115,7 +115,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) imSkype = d.elementsByTagName("imk").item(0).toElement().text(); } -void YABEntry::fillQDomElement( TQDomElement &e ) const +void YABEntry::fillTQDomElement( TQDomElement &e ) const { e.setAttribute( "yi", yahooId ); e.setAttribute( "id", YABId ); @@ -135,24 +135,24 @@ void YABEntry::fillQDomElement( TQDomElement &e ) const e.setAttribute( "pu", privateURL ); e.setAttribute( "ti", title ); e.setAttribute( "co", corporation ); - e.setAttribute( "wa", TQString( workAdress ).replace( '\n', "
" ) ); + e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', "
" ) ); e.setAttribute( "wc", workCity ); e.setAttribute( "ws", workState ); e.setAttribute( "wz", workZIP ); e.setAttribute( "wn", workCountry ); e.setAttribute( "wu", workURL ); - e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', "
" ) ); + e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', "
" ) ); e.setAttribute( "hc", privateCity ); e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); e.setAttribute( "hn", privateCountry ); - e.setAttribute( "bi", TQString("%1/%2/%3").arg( birthday.day() ).arg( birthday.month() ).arg( birthday.year() ) ); - e.setAttribute( "an", TQString("%1/%2/%3").arg( anniversary.day() ).arg( anniversary.month() ).arg( anniversary.year() ) ); + e.setAttribute( "bi", TQString("%1/%2/%3").tqarg( birthday.day() ).tqarg( birthday.month() ).tqarg( birthday.year() ) ); + e.setAttribute( "an", TQString("%1/%2/%3").tqarg( anniversary.day() ).tqarg( anniversary.month() ).tqarg( anniversary.year() ) ); e.setAttribute( "c1", additional1 ); e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); e.setAttribute( "c4", additional4 ); - e.setAttribute( "cm", TQString( notes ).replace( '\n', "
" ) ); + e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', "
" ) ); e.setAttribute( "ima", imAIM ); e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); @@ -191,8 +191,8 @@ void YABEntry::dump() const "workZIP: " << workZIP << endl << "workCountry: " << workCountry << endl << "workURL: " << workURL << endl << - "birthday: " << birthday.toString() << endl << - "anniversary: " << anniversary.toString() << endl << + "birthday: " << TQString(birthday.toString()) << endl << + "anniversary: " << TQString(anniversary.toString()) << endl << "notes: " << notes << endl << "additional1: " << additional1 << endl << "additional2: " << additional2 << endl << diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.h b/kopete/protocols/yahoo/libkyahoo/yabentry.h index 35620911..14cacef8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.h +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h @@ -25,65 +25,65 @@ struct YABEntry enum Source { SourceYAB, SourceContact }; // Personal - QString firstName; - QString secondName; - QString lastName; - QString nickName; - QString title; + TQString firstName; + TQString secondName; + TQString lastName; + TQString nickName; + TQString title; // Primary Information - QString phoneMobile; - QString email; - QString yahooId; + TQString phoneMobile; + TQString email; + TQString yahooId; int YABId; Source source; // Additional Information - QString pager; - QString fax; - QString additionalNumber; - QString altEmail1; - QString altEmail2; - QString imAIM; - QString imICQ; - QString imMSN; - QString imGoogleTalk; - QString imSkype; - QString imIRC; - QString imQQ; + TQString pager; + TQString fax; + TQString additionalNumber; + TQString altEmail1; + TQString altEmail2; + TQString imAIM; + TQString imICQ; + TQString imMSN; + TQString imGoogleTalk; + TQString imSkype; + TQString imIRC; + TQString imQQ; // Private Information - QString privateAdress; - QString privateCity; - QString privateState; - QString privateZIP; - QString privateCountry; - QString privatePhone; - QString privateURL; + TQString privateAdress; + TQString privateCity; + TQString privateState; + TQString privateZIP; + TQString privateCountry; + TQString privatePhone; + TQString privateURL; // Work Information - QString corporation; - QString workAdress; - QString workCity; - QString workState; - QString workZIP; - QString workCountry; - QString workPhone; - QString workURL; + TQString corporation; + TQString workAdress; + TQString workCity; + TQString workState; + TQString workZIP; + TQString workCountry; + TQString workPhone; + TQString workURL; // Miscellaneous - QDate birthday; - QDate anniversary; - QString notes; - QString additional1; - QString additional2; - QString additional3; - QString additional4; + TQDate birthday; + TQDate anniversary; + TQString notes; + TQString additional1; + TQString additional2; + TQString additional3; + TQString additional4; - void fromQDomElement( const TQDomElement &e ); - void fromQDomDocument( const TQDomDocument &e ); - void fillQDomElement( TQDomElement &e ) const; + void fromTQDomElement( const TQDomElement &e ); + void fromTQDomDocument( const TQDomDocument &e ); + void fillTQDomElement( TQDomElement &e ) const; void dump() const; }; diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 1066640e..be274230 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -27,7 +27,7 @@ #include <kio/jobclasses.h> #include <klocale.h> -YABTask::YABTask(Task* parent) : Task(parent) +YABTask::YABTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -82,7 +82,7 @@ void YABTask::parseContactDetails( YMSGTransfer* t ) TQDomDocument doc; doc.setContent( s ); YABEntry *entry = new YABEntry; - entry->fromQDomDocument( doc ); + entry->fromTQDomDocument( doc ); entry->source = YABEntry::SourceContact; entry->dump(); emit gotEntry( entry ); @@ -93,14 +93,14 @@ void YABTask::parseContactDetails( YMSGTransfer* t ) void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) { kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl; - m_data = TQString::null; - TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") - .arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING ); + m_data = TQString(); + TQString url = TQString::tqfromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") + .tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING ); m_transferJob = KIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); - m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") - .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); + m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;") + .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) ); connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); } @@ -149,7 +149,7 @@ void YABTask::slotResult( KIO::Job* job ) e = list.item( it ).toElement(); YABEntry *entry = new YABEntry; - entry->fromQDomElement( e ); + entry->fromTQDomElement( e ); entry->source = YABEntry::SourceYAB; emit gotEntry( entry ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h index 3086a01a..16620fcd 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h @@ -34,8 +34,9 @@ namespace KIO { class YABTask : public Task { Q_OBJECT + TQ_OBJECT public: - YABTask(Task *parent); + YABTask(Task *tqparent); ~YABTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 025386f0..81b2f53e 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl; KIO::TransferJob *transfer; TQString Url = url.url(); - TQString ext = Url.left( Url.findRev( "?" ) ); - ext = ext.right( ext.length() - ext.findRev( "." ) ); + TQString ext = Url.left( Url.tqfindRev( "?" ) ); + ext = ext.right( ext.length() - ext.tqfindRev( "." ) ); transfer = KIO::get( url, false, false ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); @@ -81,7 +81,7 @@ void YahooBuddyIconLoader::slotComplete( KIO::Job *job ) { kdDebug(YAHOO_RAW_DEBUG) << "An error occurred while downloading buddy icon." << endl; if( m_client ) - m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); + m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); } else { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h index f200725d..4726f1ec 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h @@ -45,9 +45,10 @@ struct IconLoadJob { * If the download was succesfull it emits a signal with a pointer * to the temporary file, the icon was stored at */ -class YahooBuddyIconLoader : public QObject +class YahooBuddyIconLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: YahooBuddyIconLoader( Client *c ); ~YahooBuddyIconLoader(); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index 028396c2..ed673c2f 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -22,8 +22,8 @@ #include "yahoobytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *parent ) - : ByteStream ( parent ) +KNetworkByteStream::KNetworkByteStream( TQObject *tqparent ) + : ByteStream ( tqparent ) { kdDebug( 14181 ) << "Instantiating new KNetwork byte stream." << endl; @@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed() if ( mClosing ) { kdDebug( 14181 ) << "..by ourselves!" << endl; - kdDebug( 14181 ) << "socket error is " << socket()->errorString() << endl; + kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl; emit connectionClosed (); } else @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "yahoobytestream.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index 5f7f0206..4ed96d3a 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -32,9 +32,10 @@ class KNetworkByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - KNetworkByteStream ( TQObject *parent = 0 ); + KNetworkByteStream ( TQObject *tqparent = 0 ); ~KNetworkByteStream (); @@ -65,4 +66,4 @@ private: #endif // YAHOOBYTESTREAM_H -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 1c9528ff..3f3af310 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -27,7 +27,7 @@ #include <kio/jobclasses.h> #include <tqdom.h> -YahooChatTask::YahooChatTask(Task* parent) : Task(parent) +YahooChatTask::YahooChatTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; m_loggedIn = false; @@ -95,7 +95,7 @@ void YahooChatTask::getYahooChatCategories() transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) ); @@ -107,11 +107,11 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl; KIO::TransferJob *transfer; - transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false ); + transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( category.id )), false, false ); transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) ); @@ -214,7 +214,7 @@ void YahooChatTask::login() YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceChatOnline); t->setId( client()->sessionID() ); t->setParam( 1, client()->userId().local8Bit() ); - t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); + t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); send( t ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h index 94101d33..ef20a815 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h @@ -41,8 +41,9 @@ struct YahooChatJob { class YahooChatTask : public Task { Q_OBJECT + TQ_OBJECT public: - YahooChatTask(Task *parent); + YahooChatTask(Task *tqparent); virtual ~YahooChatTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 34eb649e..45716e35 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -58,9 +58,9 @@ public: conn = 0; bs = 0; - username = TQString::null; - password = TQString::null; - server = TQString::null; + username = TQString(); + password = TQString(); + server = TQString(); haveLocalAddr = false; doBinding = true; @@ -79,7 +79,7 @@ public: bool doAuth; //send the initial login sequences to get the cookie bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; bool doBinding; Connector *conn; @@ -102,8 +102,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *parent) -:Stream(parent), d(new Private()) +ClientStream::ClientStream(Connector *conn, TQObject *tqparent) +:Stream(tqparent), d(new Private()) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -203,7 +203,7 @@ void ClientStream::setNoopTime(int mills) d->noopTimer.start(d->noop_time); } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "contains: %i bytes ", bytes.count() ); + qDebug( "tqcontains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h index 89a116fd..bc56eafd 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h @@ -32,6 +32,7 @@ class Transfer; class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -71,7 +72,7 @@ public: BindConflict // resource in-use }; - explicit ClientStream(Connector *conn, TQObject *parent=0); + explicit ClientStream(Connector *conn, TQObject *tqparent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); @@ -83,7 +84,7 @@ public: void setUsername(const TQString &s); void setPassword(const TQString &s); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); void close(); @@ -152,7 +153,7 @@ private: /** * convert internal method representation to wire */ - static char* encode_method(Q_UINT8 method); + static char* encode_method(TQ_UINT8 method); }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 9b7c8d8a..0e0f8436 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -25,8 +25,8 @@ #include "yahoobytestream.h" #include "yahootypes.h" -KNetworkConnector::KNetworkConnector( TQObject *parent ) - : Connector( parent ) +KNetworkConnector::KNetworkConnector( TQObject *tqparent ) + : Connector( tqparent ) { kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl; @@ -97,7 +97,7 @@ void KNetworkConnector::done() mByteStream->close (); } -void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) +void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) { kdDebug ( YAHOO_RAW_DEBUG ) << "Manually specifying host " << host << " and port " << port << endl; @@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) #include "yahooconnector.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h index b4758e72..9a33a2e7 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h @@ -34,9 +34,10 @@ class KNetworkConnector : public Connector { Q_OBJECT + TQ_OBJECT public: - KNetworkConnector( TQObject *parent = 0 ); + KNetworkConnector( TQObject *tqparent = 0 ); virtual ~KNetworkConnector(); @@ -44,7 +45,7 @@ public: virtual ByteStream *stream() const; virtual void done(); - void setOptHostPort( const TQString &host, Q_UINT16 port ); + void setOptHostPort( const TQString &host, TQ_UINT16 port ); int errorCode(); @@ -54,7 +55,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; KNetworkByteStream *mByteStream; @@ -63,4 +64,4 @@ private: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h index 0e8858c5..a5017609 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahootypes.h +++ b/kopete/protocols/yahoo/libkyahoo/yahootypes.h @@ -93,8 +93,8 @@ namespace Yahoo ServicePictureUpdate = 0xc1, ServicePictureUpload = 0xc2, ServiceVisibility = 0xc5, /* YMSG13, key 13: 2 = invisible, 1 = visible */ - ServiceStatus = 0xc6, /* YMSG13 */ - ServicePictureStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */ + ServicetqStatus = 0xc6, /* YMSG13 */ + ServicePicturetqStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */ ServiceContactDetails = 0xd3, /* YMSG13 */ ServiceChatSession = 0xd4, ServiceAuthorization = 0xd6, /* YMSG13 */ @@ -102,11 +102,11 @@ namespace Yahoo ServiceFileTransfer7Info = 0xdd, /* YMSG13 */ ServiceFileTransfer7Accept = 0xde, /* YMSG13 */ ServiceBuddyChangeGroup = 0xe7, /* YMSG13 */ - ServiceBuddyStatus = 0xf0, + ServiceBuddytqStatus = 0xf0, ServiceBuddyList = 0xf1 }; - enum Status + enum tqStatus { StatusConnecting = -2, StatusDisconnected = -1, @@ -134,7 +134,7 @@ namespace Yahoo StatusTypeAway }; - enum LoginStatus { + enum LogintqStatus { LoginOk = 0, LoginUname = 3, LoginPasswd = 13, @@ -150,7 +150,7 @@ namespace Yahoo StealthPermOffline }; - enum StealthStatus { + enum StealthtqStatus { StealthActive = 1, StealthNotActive = 2, StealthClear = 3 @@ -161,15 +161,15 @@ namespace Yahoo ResponseDecline }; - enum PictureStatus { + enum PicturetqStatus { NoPicture = 0, Avatar = 1, Picture = 2 }; - typedef Q_UINT8 BYTE; - typedef Q_UINT16 WORD; - typedef Q_UINT32 DWORD; + typedef TQ_UINT8 BYTE; + typedef TQ_UINT16 WORD; + typedef TQ_UINT32 DWORD; struct ChatRoom { TQString name; diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp index b1e6e4e3..5517c3f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp @@ -36,8 +36,8 @@ using namespace Yahoo; -YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) int pos = 0; int len = 0; - Yahoo::Status status = Yahoo::StatusAvailable; + Yahoo::tqStatus status = Yahoo::StatusAvailable; Yahoo::Service service = Yahoo::ServiceAuth; int statusnum = 0; int sessionid = 0; @@ -149,9 +149,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceIddeAct " << servicenum << endl; service = Yahoo::ServiceIddeAct; break; - case (Yahoo::ServiceStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl; - service = Yahoo::ServiceStatus; + case (Yahoo::ServicetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicetqStatus " << servicenum << endl; + service = Yahoo::ServicetqStatus; break; case (Yahoo::ServiceMessage) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceMessage " << servicenum << endl; @@ -177,9 +177,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureChecksum " << servicenum << endl; service = Yahoo::ServicePictureChecksum; break; - case (Yahoo::ServicePictureStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl; - service = Yahoo::ServicePictureStatus; + case (Yahoo::ServicePicturetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicturetqStatus " << servicenum << endl; + service = Yahoo::ServicePicturetqStatus; break; case (Yahoo::ServicePicture) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicture " << servicenum << endl; @@ -297,9 +297,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceComment " << servicenum << endl; service = Yahoo::ServiceComment; break; - case (Yahoo::ServiceBuddyStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl; - service = Yahoo::ServiceBuddyStatus; + case (Yahoo::ServiceBuddytqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddytqStatus " << servicenum << endl; + service = Yahoo::ServiceBuddytqStatus; break; case (Yahoo::ServiceBuddyList) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyList " << servicenum << endl; @@ -329,7 +329,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) ServiceGroupRename = 0x89, // > 1, 65(new), 66(0), 67(old) ServicePictureUpdate = 0xc1, ServiceVisibility = 0xc5, // YMSG13, key 13: 2 = invisible, 1 = visible - ServiceStatus = 0xc6, // YMSG13 + ServicetqStatus = 0xc6, // YMSG13 */ default: @@ -378,7 +378,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) YMSGTransfer *t = new YMSGTransfer(); t->setService(service); t->setId(sessionid); - t->setStatus(status); + t->settqStatus(status); t->setPacketLength(len); TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos ); diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h index a3ac04a6..1703e36f 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h @@ -25,10 +25,11 @@ class YMSGProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - YMSGProtocol( TQObject *parent = 0, const char *name = 0 ); + YMSGProtocol( TQObject *tqparent = 0, const char *name = 0 ); ~YMSGProtocol(); /** diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp index dcee98d9..3ed2192a 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp @@ -39,7 +39,7 @@ public: int version; int packetLength; Yahoo::Service service; - Yahoo::Status status; + Yahoo::tqStatus status; unsigned int id; ParamList data; bool valid; @@ -62,7 +62,7 @@ YMSGTransfer::YMSGTransfer(Yahoo::Service service) d->status = Yahoo::StatusAvailable; } -YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status) +YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status) { d = new YMSGTransferPrivate; d->valid = true; @@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service) d->service = service; } -Yahoo::Status YMSGTransfer::status() const +Yahoo::tqStatus YMSGTransfer::status() const { return d->status; } -void YMSGTransfer::setStatus(Yahoo::Status status) +void YMSGTransfer::settqStatus(Yahoo::tqStatus status) { d->status = status; } @@ -222,27 +222,27 @@ TQByteArray YMSGTransfer::serialize() const TQByteArray buffer; TQDataStream stream( buffer, IO_WriteOnly ); - stream << (Q_INT8)'Y' << (Q_INT8)'M' << (Q_INT8)'S' << (Q_INT8)'G'; + stream << (TQ_INT8)'Y' << (TQ_INT8)'M' << (TQ_INT8)'S' << (TQ_INT8)'G'; if( d->service == Yahoo::ServicePictureUpload ) - stream << (Q_INT16)0x0f00; + stream << (TQ_INT16)0x0f00; else - stream << (Q_INT16)0x000f; - stream << (Q_INT16)0x0000; + stream << (TQ_INT16)0x000f; + stream << (TQ_INT16)0x0000; if( d->service == Yahoo::ServicePictureUpload || d->service == Yahoo::ServiceFileTransfer ) - stream << (Q_INT16)(length()+4); + stream << (TQ_INT16)(length()+4); else - stream << (Q_INT16)length(); - stream << (Q_INT16)d->service; - stream << (Q_INT32)d->status; - stream << (Q_INT32)d->id; + stream << (TQ_INT16)length(); + stream << (TQ_INT16)d->service; + stream << (TQ_INT32)d->status; + stream << (TQ_INT32)d->id; for (ParamList::ConstIterator it = d->data.constBegin(); it != d->data.constEnd(); ++it) { kdDebug(YAHOO_RAW_DEBUG) << " Serializing key " << (*it).first << " value " << (*it).second << endl; stream.writeRawBytes ( TQString::number( (*it).first ).local8Bit(), TQString::number( (*it).first ).length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; stream.writeRawBytes( (*it).second, (*it).second.length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; } kdDebug(YAHOO_RAW_DEBUG) << " pos=" << pos << " (packet size)" << buffer << endl; return buffer; diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h index 0b157792..953d3993 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h @@ -30,7 +30,7 @@ class YMSGTransferPrivate; -typedef QPair< int, TQCString > Param; +typedef TQPair< int, TQCString > Param; typedef TQValueList< Param > ParamList; /** @@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer { public: YMSGTransfer(Yahoo::Service service); - YMSGTransfer(Yahoo::Service service, Yahoo::Status status); + YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status); YMSGTransfer(); ~YMSGTransfer(); @@ -51,8 +51,8 @@ public: bool isValid() const; Yahoo::Service service() const; void setService(Yahoo::Service service); - Yahoo::Status status() const; - void setStatus(Yahoo::Status status); + Yahoo::tqStatus status() const; + void settqStatus(Yahoo::tqStatus status); unsigned int id() const; void setId(unsigned int id); int packetLength() const; diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index ff3ef8f6..7aa1bd78 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>YahooAddContactBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -25,15 +25,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -50,7 +50,7 @@ <string>The account name of the Yahoo account you would like to add. This should be in the form of an alphanumeric string (no spaces).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>contactID</cstring> </property> @@ -63,14 +63,14 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> <property name="text"> <string><i>(for example: joe8752)</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -93,5 +93,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 4b98f8be..a9102967 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooEditAccountBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooEditAccountBase</cstring> </property> @@ -25,17 +25,17 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget11</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>460</width> <height>0</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mAccountInfo</cstring> </property> @@ -57,15 +57,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout81</cstring> + <cstring>tqlayout81</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label1</cstring> </property> @@ -82,7 +82,7 @@ <string>The account name of your Yahoo account. This should be in the form of an alphanumeric string (no spaces).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mScreenName</cstring> </property> @@ -95,7 +95,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mAutoConnect</cstring> </property> @@ -106,7 +106,7 @@ <string>Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mGlobalIdentity</cstring> </property> @@ -116,7 +116,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -135,7 +135,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -147,7 +147,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -156,11 +156,11 @@ <property name="text"> <string>To connect to the Yahoo network, you will need a Yahoo account.<br><br>If you do not currently have a Yahoo account, please click the button to create one.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonRegister</cstring> </property> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -198,7 +198,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -219,14 +219,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox73</cstring> </property> @@ -237,7 +237,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>optionOverrideServer</cstring> </property> @@ -248,15 +248,15 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout58</cstring> + <cstring>tqlayout58</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblServer</cstring> </property> @@ -270,13 +270,13 @@ <cstring>edtServerAddress</cstring> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string> + <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> + <string>The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editServerAddress</cstring> </property> @@ -287,13 +287,13 @@ <string>scs.msg.yahoo.com</string> </property> <property name="toolTip" stdset="0"> - <string>The IP address or hostmask of the Yahoo server you wish to connect to.</string> + <string>The IP address or hosttqmask of the Yahoo server you wish to connect to.</string> </property> <property name="whatsThis" stdset="0"> - <string>The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> + <string>The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com).</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblPort</cstring> </property> @@ -313,7 +313,7 @@ <string>The port on the Yahoo server that you would like to connect to. Normally this is 5050, but Yahoo also allows port 80 in case you are behind a firewall.</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbxServerPort</cstring> </property> @@ -340,7 +340,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -351,12 +351,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="0"> + <widget class="TQLineEdit" row="1" column="0"> <property name="name"> <cstring>editPictureUrl</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>buttonSelectPicture</cstring> </property> @@ -367,17 +367,17 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>m_Picture</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>96</width> <height>96</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>96</width> <height>96</height> @@ -396,7 +396,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>optionSendBuddyIcon</cstring> </property> @@ -409,14 +409,14 @@ </grid> </widget> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelStatusMessage</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -460,8 +460,8 @@ <tabstop>mAutoConnect</tabstop> <tabstop>buttonRegister</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="private" specifier="nicht virtual">slotSelectPicture()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui index b74dc94b..a9b93dcf 100644 --- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooGeneralInfoWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooGeneralInfoWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fullNameLabel_2</cstring> </property> @@ -38,7 +38,7 @@ <cstring>fullNameEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>fullNameLabel_2_2</cstring> </property> @@ -49,7 +49,7 @@ <cstring>fullNameEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>LastNameLabel</cstring> </property> @@ -60,7 +60,7 @@ <cstring>fullNameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lastNameEdit</cstring> </property> @@ -68,7 +68,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>nickNameEdit</cstring> </property> @@ -84,7 +84,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>nickNameLabel</cstring> </property> @@ -95,7 +95,7 @@ <cstring>nickNameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>firstNameEdit</cstring> </property> @@ -103,7 +103,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>secondNameEdit</cstring> </property> @@ -111,7 +111,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>yahooIdLabel</cstring> </property> @@ -122,7 +122,7 @@ <cstring>uinEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>yahooIdLabel_2</cstring> </property> @@ -133,7 +133,7 @@ <cstring>uinEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>birthdayLabel_2</cstring> </property> @@ -144,7 +144,7 @@ <cstring>birthday</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>yahooIdEdit</cstring> </property> @@ -163,7 +163,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>titleEdit</cstring> </property> @@ -179,7 +179,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="2" column="3"> + <widget class="TQLineEdit" row="2" column="3"> <property name="name"> <cstring>birthdayEdit</cstring> </property> @@ -187,7 +187,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="3" column="3"> + <widget class="TQLineEdit" row="3" column="3"> <property name="name"> <cstring>anniversaryEdit</cstring> </property> @@ -195,7 +195,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>birthdayLabel</cstring> </property> @@ -218,14 +218,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> </size> </property> </spacer> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -236,7 +236,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel6_2_2</cstring> </property> @@ -247,7 +247,7 @@ <cstring>cellEdit</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel10_2</cstring> </property> @@ -258,7 +258,7 @@ <cstring>homepageEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>emailEdit_3</cstring> </property> @@ -274,7 +274,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -285,7 +285,7 @@ <cstring>emailEdit</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel9_3</cstring> </property> @@ -296,7 +296,7 @@ <cstring>emailEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel9_2</cstring> </property> @@ -307,7 +307,7 @@ <cstring>emailEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>emailEdit_2</cstring> </property> @@ -323,7 +323,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="6" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="6" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>homepageEdit</cstring> </property> @@ -339,7 +339,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>emailEdit</cstring> </property> @@ -355,7 +355,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>faxEdit</cstring> </property> @@ -363,7 +363,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel7_2</cstring> </property> @@ -374,7 +374,7 @@ <cstring>faxEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel6_2_2_2</cstring> </property> @@ -385,7 +385,7 @@ <cstring>cellEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>pagerEdit</cstring> </property> @@ -401,7 +401,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>additionalEdit</cstring> </property> @@ -417,7 +417,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -428,7 +428,7 @@ <cstring>phoneEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>cellEdit</cstring> </property> @@ -444,7 +444,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -455,7 +455,7 @@ <cstring>cellEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>phoneEdit</cstring> </property> @@ -468,7 +468,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -479,7 +479,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -490,7 +490,7 @@ <cstring>addressEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -501,7 +501,7 @@ <cstring>countryEdit</cstring> </property> </widget> - <widget class="QTextEdit" row="0" column="1" rowspan="2" colspan="3"> + <widget class="TQTextEdit" row="0" column="1" rowspan="2" colspan="3"> <property name="name"> <cstring>addressEdit</cstring> </property> @@ -516,14 +516,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>78</height> </size> </property> </spacer> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -534,7 +534,7 @@ <cstring>stateEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>stateEdit</cstring> </property> @@ -550,7 +550,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -561,7 +561,7 @@ <cstring>cityEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="3"> + <widget class="TQLineEdit" row="2" column="3"> <property name="name"> <cstring>cityEdit</cstring> </property> @@ -577,7 +577,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="3" column="3"> + <widget class="TQLineEdit" row="3" column="3"> <property name="name"> <cstring>countryEdit</cstring> </property> @@ -585,7 +585,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -596,7 +596,7 @@ <cstring>zipEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>zipEdit</cstring> </property> @@ -643,5 +643,5 @@ <tabstop>homepageEdit</tabstop> <tabstop>yahooIdEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 09a3cd15..6c83ac64 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooInviteListBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>YahooInviteListBase</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -38,15 +38,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -54,7 +54,7 @@ <string>Friend List</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -63,7 +63,7 @@ <property name="name"> <cstring>listFriends</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>180</height> @@ -72,15 +72,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -88,7 +88,7 @@ <string>Chat Invitation List</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -97,27 +97,27 @@ <property name="name"> <cstring>listInvited</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>150</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editBuddyAdd</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnCustomAdd</cstring> </property> @@ -129,9 +129,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -147,14 +147,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btn_Add</cstring> </property> @@ -162,7 +162,7 @@ <string>Add >></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btn_Remove</cstring> </property> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -191,15 +191,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>txtInvMsg</cstring> </property> @@ -217,29 +217,29 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>editMessage</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnCancel</cstring> </property> @@ -265,14 +265,14 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>350</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnInvite</cstring> </property> @@ -326,12 +326,12 @@ <slot>btnRemove_clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnAddCustom_clicked()</slot> <slot>btnCancel_clicked()</slot> <slot>btnInvite_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index 594e7a01..a5f27b86 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -22,7 +22,7 @@ #include <tqlistbox.h> #include <tqlineedit.h> -YahooInviteListImpl::YahooInviteListImpl(TQWidget *parent, const char *name) : YahooInviteListBase(parent,name) +YahooInviteListImpl::YahooInviteListImpl(TQWidget *tqparent, const char *name) : YahooInviteListBase(tqparent,name) { listFriends->setSelectionMode( TQListBox::Extended ); listInvited->setSelectionMode( TQListBox::Extended ); @@ -65,9 +65,9 @@ void YahooInviteListImpl::addInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_inviteeList.find( *it ) == m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) == m_inviteeList.end() ) m_inviteeList.push_back( *it ); - if( m_buddyList.find( *it ) != m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) != m_buddyList.end() ) m_buddyList.remove( *it ); } @@ -80,9 +80,9 @@ void YahooInviteListImpl::removeInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_buddyList.find( *it ) == m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) == m_buddyList.end() ) m_buddyList.push_back( *it ); - if( m_inviteeList.find( *it ) != m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) != m_inviteeList.end() ) m_inviteeList.remove( *it ); } diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h index 94fa6402..270fef08 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h @@ -25,8 +25,9 @@ class YahooInviteListImpl : public YahooInviteListBase { Q_OBJECT + TQ_OBJECT public: - YahooInviteListImpl(TQWidget *parent=0, const char *name=0); + YahooInviteListImpl(TQWidget *tqparent=0, const char *name=0); ~YahooInviteListImpl(); void fillFriendList( const TQStringList &buddies ); diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui index db2e4a8f..98d754d6 100644 --- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooOtherInfoWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooOtherInfoWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -24,7 +24,7 @@ <string>Contact comments:</string> </property> </widget> - <widget class="QTextEdit" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQTextEdit" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>commentsEdit</cstring> </property> @@ -32,7 +32,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -40,7 +40,7 @@ <string>Note 1:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>note1Edit</cstring> </property> @@ -48,7 +48,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -56,7 +56,7 @@ <string>Note 2:</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>note2Edit</cstring> </property> @@ -64,7 +64,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>note3Edit</cstring> </property> @@ -72,7 +72,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -80,7 +80,7 @@ <string>Note 3:</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>note4Edit</cstring> </property> @@ -88,7 +88,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> @@ -115,5 +115,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui index 6c9a6fc0..f83b2050 100644 --- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui +++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooStealthSetting</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooStealthSetting</cstring> </property> @@ -12,7 +12,7 @@ <height>114</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>195</width> <height>75</height> @@ -22,14 +22,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> <string>Show Me As</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioPermOffline</cstring> </property> @@ -45,7 +45,7 @@ <string>Perma&nently offline</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioOnline</cstring> </property> @@ -64,7 +64,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioOffline</cstring> </property> @@ -92,5 +92,5 @@ <tabstops> <tabstop>radioOnline</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..536f975b 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -39,29 +39,29 @@ #include "yahoootherinfowidget.h" #include "yahoocontact.h" -YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) +YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) { kdDebug(14180) << k_funcinfo << "Creating new yahoo user info widget" << endl; m_contact = c; showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) ); TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo ); m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" ); genLayout->addWidget( m_genInfoWidget ); TQFrame* workInfo = addPage( i18n( "Work Info" ), i18n( "Work Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) ); TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo ); m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" ); workLayout->addWidget( m_workInfoWidget ); TQFrame* otherInfo = addPage( i18n( "Other Info" ), i18n( "Other Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo ); m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); @@ -219,9 +219,9 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) m_genInfoWidget->titleEdit->setText( yab.title ); if( yab.birthday.isValid() ) - m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() )); + m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() )); if( yab.anniversary.isValid() ) - m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() )); + m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() )); m_genInfoWidget->addressEdit->setText( yab.privateAdress ); m_genInfoWidget->cityEdit->setText( yab.privateCity ); @@ -256,5 +256,5 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) #include "yahoouserinfodialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index e8529033..a2cff58e 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -32,8 +32,9 @@ class YahooContact; class YahooUserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 ); + YahooUserInfoDialog( YahooContact *c, TQWidget* tqparent = 0, const char* name = 0 ); void setAccountConnected( bool isOnline ); signals: void saveYABEntry( YABEntry & ); @@ -53,4 +54,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 73eb827a..10eccd2e 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooVerifyAccountBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooVerifyAccountBase</cstring> </property> @@ -12,7 +12,7 @@ <height>200</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>450</width> <height>200</height> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -30,15 +30,15 @@ <string>Your Account has to be verified because of too many false login attempts.<br></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout0</cstring> + <cstring>tqlayout0</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -46,7 +46,7 @@ <string>Please enter the chars shown in the picture:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mWord</cstring> </property> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -80,16 +80,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <hbox> <property name="name"> @@ -105,18 +105,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>72</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mPicture</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>75</height> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>72</width> <height>20</height> @@ -155,5 +155,5 @@ <data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index caa3c75a..9c37c07d 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -27,9 +27,9 @@ #include <webcamwidget.h> -YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ), - KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) +YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), + KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); @@ -44,11 +44,11 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare m_imageContainer = new Kopete::WebcamWidget( page ); m_imageContainer->setText( i18n( "No webcam image received" ) ); m_imageContainer->setMinimumSize(320,240); - m_imageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( m_imageContainer ); m_Viewer = new TQLabel( page ); - m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_Viewer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_Viewer->hide(); topLayout->add( m_Viewer ); @@ -67,7 +67,7 @@ void YahooWebcamDialog::newImage( const TQPixmap &image ) void YahooWebcamDialog::webcamPaused() { - m_imageContainer->setText( TQString::fromLatin1("*** Webcam paused ***") ); + m_imageContainer->setText( TQString::tqfromLatin1("*** Webcam paused ***") ); } void YahooWebcamDialog::webcamClosed( int reason ) @@ -77,15 +77,15 @@ void YahooWebcamDialog::webcamClosed( int reason ) switch ( reason ) { case 1: - closeReason = i18n( "%1 has stopped broadcasting" ).arg( contactName ); break; + closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break; case 2: - closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break; + closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break; case 3: - closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break; + closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break; case 4: - closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break; + closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break; default: - closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName); + closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( contactName); } m_imageContainer->clear(); @@ -94,7 +94,7 @@ void YahooWebcamDialog::webcamClosed( int reason ) void YahooWebcamDialog::setViewer( const TQStringList &viewer ) { - TQString s = i18n( "%1 viewer(s)" ).arg( viewer.size() ); + TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() ); if( viewer.size() ) { s += ": "; diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h index 67380d1f..eb8e1626 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h @@ -33,8 +33,9 @@ namespace Kopete class YahooWebcamDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); + YahooWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); ~YahooWebcamDialog(); void setViewer( const TQStringList & ); diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui index 0be88f61..5a61311a 100644 --- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>YahooWorkInfoWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>YahooWorkInfoWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -35,7 +35,7 @@ <string>Phone:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>phoneEdit</cstring> </property> @@ -53,7 +53,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -72,7 +72,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -80,7 +80,7 @@ <string>Homepage:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>companyEdit</cstring> </property> @@ -88,7 +88,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>homepageEdit</cstring> </property> @@ -96,7 +96,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -112,7 +112,7 @@ <string>Country:</string> </property> </widget> - <widget class="QLineEdit" row="7" column="1"> + <widget class="TQLineEdit" row="7" column="1"> <property name="name"> <cstring>countryEdit</cstring> </property> @@ -120,12 +120,12 @@ <bool>false</bool> </property> </widget> - <widget class="QTextEdit" row="2" column="1" rowspan="2" colspan="1"> + <widget class="TQTextEdit" row="2" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>addressEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -143,14 +143,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>cityEdit</cstring> </property> @@ -158,7 +158,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>stateEdit</cstring> </property> @@ -166,7 +166,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -174,7 +174,7 @@ <string>State:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -182,7 +182,7 @@ <string>City:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -190,7 +190,7 @@ <string>Zip:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>zipEdit</cstring> </property> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>150</height> @@ -229,5 +229,5 @@ <tabstop>stateEdit</tabstop> <tabstop>countryEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index ae33f264..fb2c3447 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -66,14 +66,14 @@ #include "yabentry.h" #include "yahoouserinfodialog.h" -YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, const char *name) - : Kopete::PasswordedAccount(parent, accountId, 0, name) +YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, const char *name) + : Kopete::PasswordedAccount(tqparent, accountId, 0, name) { // first things first - initialise internals stateOnConnection = 0; theHaveContactList = false; - m_protocol = parent; + m_protocol = tqparent; m_session = new Client( this ); m_lastDisconnectCode = 0; m_currentMailCount = 0; @@ -101,7 +101,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); - _myself->setOnlineStatus( parent->Offline ); + _myself->setOnlineStatus( tqparent->Offline ); myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, configGroup()->readEntry( "iconRemoteUrl", "" ) ); myself()->setProperty( Kopete::Global::Properties::self()->photo(), configGroup()->readEntry( "iconLocalUrl", "" ) ); myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readEntry( "iconCheckSum", 0 ) ); @@ -109,7 +109,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con // initConnectionSignals( MakeConnections ); - TQString displayName = configGroup()->readEntry(TQString::fromLatin1("displayName"), TQString()); + TQString displayName = configGroup()->readEntry(TQString::tqfromLatin1("displayName"), TQString()); if(!displayName.isEmpty()) _myself->setNickName(displayName); @@ -130,17 +130,17 @@ YahooAccount::~YahooAccount() void YahooAccount::setServer( const TQString &server ) { - configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server ); } void YahooAccount::setPort( int port ) { - configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port ); } -void YahooAccount::slotGoStatus( int status, const TQString &awayMessage) +void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage) { - kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl; + kdDebug(YAHOO_GEN_DEBUG) << "GotqStatus: " << status << " msg: " << awayMessage << endl; if( !isConnected() ) { connect( m_protocol->statusFromYahoo( status ) ); @@ -148,7 +148,7 @@ void YahooAccount::slotGoStatus( int status, const TQString &awayMessage) } else { - m_session->changeStatus( Yahoo::Status( status ), awayMessage, + m_session->changetqStatus( Yahoo::tqStatus( status ), awayMessage, (status == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); //sets the awayMessage property for the owner of the account. shows up in the statusbar icon's tooltip. the property is unset when awayMessage is null @@ -167,16 +167,16 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg) TQString filteredMsg = msg; //Handle bold, underline and italic messages - filteredMsg.replace( "\033[1m", "<b>" ); - filteredMsg.replace( "\033[x1m", "</b>" ); - filteredMsg.replace( "\033[2m", "<i>" ); - filteredMsg.replace( "\033[x2m", "</i>" ); - filteredMsg.replace( "\033[4m", "<u>" ); - filteredMsg.replace( "\033[x4m", "</u>" ); + filteredMsg.tqreplace( "\033[1m", "<b>" ); + filteredMsg.tqreplace( "\033[x1m", "</b>" ); + filteredMsg.tqreplace( "\033[2m", "<i>" ); + filteredMsg.tqreplace( "\033[x2m", "</i>" ); + filteredMsg.tqreplace( "\033[4m", "<u>" ); + filteredMsg.tqreplace( "\033[x4m", "</u>" ); //GAIM doesn't check for ^[[3m. Does this ever get sent? - filteredMsg.replace( "\033[3m", "<i>" ); - filteredMsg.replace( "\033[x3m", "</i>" ); + filteredMsg.tqreplace( "\033[3m", "<i>" ); + filteredMsg.tqreplace( "\033[x3m", "</i>" ); //Strip link tags filteredMsg.remove( "\033[lm" ); @@ -196,30 +196,30 @@ TQColor YahooAccount::getMsgColor(const TQString& msg) //kdDebug(YAHOO_GEN_DEBUG) << "msg is " << msg; //Please note that some of the colors are hard-coded to //match the yahoo colors - if ( msg.find("\033[38m") != -1 ) - return Qt::red; - if ( msg.find("\033[34m") != -1 ) - return Qt::green; - if ( msg.find("\033[31m") != -1 ) - return Qt::blue; - if ( msg.find("\033[39m") != -1 ) - return Qt::yellow; - if ( msg.find("\033[36m") != -1 ) - return Qt::darkMagenta; - if ( msg.find("\033[32m") != -1 ) - return Qt::cyan; - if ( msg.find("\033[37m") != -1 ) + if ( msg.tqfind("\033[38m") != -1 ) + return TQt::red; + if ( msg.tqfind("\033[34m") != -1 ) + return TQt::green; + if ( msg.tqfind("\033[31m") != -1 ) + return TQt::blue; + if ( msg.tqfind("\033[39m") != -1 ) + return TQt::yellow; + if ( msg.tqfind("\033[36m") != -1 ) + return TQt::darkMagenta; + if ( msg.tqfind("\033[32m") != -1 ) + return TQt::cyan; + if ( msg.tqfind("\033[37m") != -1 ) return TQColor("#FFAA39"); - if ( msg.find("\033[35m") != -1 ) + if ( msg.tqfind("\033[35m") != -1 ) return TQColor("#FFD8D8"); - if ( msg.find("\033[#") != -1 ) + if ( msg.tqfind("\033[#") != -1 ) { - kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.find("\033[#")+2,7) << endl; - return TQColor(msg.mid(msg.find("\033[#")+2,7)); + kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.tqfind("\033[#")+2,7) << endl; + return TQColor(msg.mid(msg.tqfind("\033[#")+2,7)); } //return a default value just in case - return Qt::black; + return TQt::black; } void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) @@ -265,8 +265,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)), + this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) ); TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); @@ -407,8 +407,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)), + this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) ); TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); @@ -526,7 +526,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd ) } if ( isConnected() || - myself()->onlineStatus() == m_protocol->Connecting ) + myself()->onlinetqStatus() == m_protocol->Connecting ) { kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." << endl; return; @@ -549,7 +549,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd ) kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":" << port << ">. user <" << accountId() << ">" << endl; static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting ); - m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) ); + m_session->setStatusOnConnect( Yahoo::tqStatus( initialtqStatus().internalStatus() ) ); m_session->connect( server, port, accountId().lower(), passwd ); } @@ -567,7 +567,7 @@ void YahooAccount::disconnect() static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline ); // FIXME: to check - //QHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); //for ( it = contacts().constBegin(); it != itEnd; ++it ) // static_cast<YahooContact *>( it.value() )->setOnlineStatus( m_protocol->Offline ); for ( TQDictIterator<Kopete::Contact> i( contacts() ); i.current(); ++i ) @@ -581,7 +581,7 @@ void YahooAccount::disconnect() m_session->cancelConnect(); // FIXME: to check - //QHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); //for ( it = contacts().constBegin(); it != itEnd; ++it ) // static_cast<YahooContact*>( it.value() )->setOnlineStatus( m_protocol->Offline ); for ( TQDictIterator<Kopete::Contact> i(contacts()); i.current(); ++i ) @@ -607,9 +607,9 @@ void YahooAccount::setAway(bool status, const TQString &awayMessage) kdDebug(YAHOO_GEN_DEBUG) ; if( awayMessage.isEmpty() ) - slotGoStatus( status ? 2 : 0 ); + slotGotqStatus( status ? 2 : 0 ); else - slotGoStatus( status ? 99 : 0, awayMessage ); + slotGotqStatus( status ? 99 : 0, awayMessage ); } void YahooAccount::slotConnected() @@ -623,7 +623,7 @@ void YahooAccount::slotGoOnline() if( !isConnected() ) connect( m_protocol->Online ); else - slotGoStatus(0); + slotGotqStatus(0); } void YahooAccount::slotGoOffline() @@ -663,7 +663,7 @@ YahooContact *YahooAccount::contact( const TQString &id ) return static_cast<YahooContact *>(contacts()[id]); } -bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) +bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) { // kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId; @@ -674,7 +674,7 @@ bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact // -- actualy (oct 2004) this method is only called when new contact are added. but this will // maybe change and you will be noticed --Olivier YahooContact *newContact = new YahooContact( this, contactId, - parentContact->displayName(), parentContact ); + tqparentContact->displayName(), tqparentContact ); return newContact != 0; } else @@ -722,9 +722,9 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url ) setupActions( succ == Yahoo::LoginOk ); if ( succ == Yahoo::LoginOk || (succ == Yahoo::LoginDupl && m_lastDisconnectCode == 2) ) { - if ( initialStatus().internalStatus() ) + if ( initialtqStatus().internalStatus() ) { - static_cast<YahooContact *>( myself() )->setOnlineStatus( initialStatus() ); + static_cast<YahooContact *>( myself() )->setOnlineStatus( initialtqStatus() ); } else { @@ -750,7 +750,7 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url ) else if(succ == Yahoo::LoginLock) { initConnectionSignals( DeleteConnections ); - errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url); + errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").tqarg(url); KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg); static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline ); disconnected( BadUserName ); // FIXME: add a more appropriate disconnect reason @@ -801,8 +801,8 @@ void YahooAccount::slotDisconnected() TQString message; message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" ) - .arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() ); - KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() ); + .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + KNotification::event( "connection_lost", message, myself()->onlinetqStatus().protocolIcon() ); } void YahooAccount::slotLoginFailed() @@ -814,8 +814,8 @@ void YahooAccount::slotLoginFailed() TQString message; message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" ) - .arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() ); - KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() ); + .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + KNotification::event( "cannot_connect", message, myself()->onlinetqStatus().protocolIcon() ); } void YahooAccount::slotError( int level ) @@ -825,17 +825,17 @@ void YahooAccount::slotError( int level ) return; else if( level <= Client::Warning ) KMessageBox::information( Kopete::UI::Global::mainWidget(), - i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ), + i18n( "%1\n\nReason: %2").tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); else KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" ) - .arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); + .tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotBuddy( const TQString &userid, const TQString &alias, const TQString &group ) { kdDebug(YAHOO_GEN_DEBUG) ; - IDs[userid] = QPair<TQString, TQString>(group, alias); + IDs[userid] = TQPair<TQString, TQString>(group, alias); // Serverside -> local if ( !contact( userid ) ) @@ -854,7 +854,7 @@ void YahooAccount::slotBuddyAddResult( const TQString &userid, const TQString &g kdDebug(YAHOO_GEN_DEBUG) << success << endl; if(success) - IDs[userid] = QPair<TQString, TQString>(group, TQString()); + IDs[userid] = TQPair<TQString, TQString>(group, TQString()); // FIXME (same) //kdDebug(YAHOO_GEN_DEBUG) << IDs << endl; @@ -878,7 +878,7 @@ void YahooAccount::slotBuddyChangeGroupResult(const TQString &userid, const TQSt kdDebug(YAHOO_GEN_DEBUG); if(success) - IDs[userid] = QPair<TQString, TQString>(group, TQString()); + IDs[userid] = TQPair<TQString, TQString>(group, TQString()); // FIXME //kdDebug(YAHOO_GEN_DEBUG) << IDs << endl; @@ -888,8 +888,8 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who ) { kdDebug(YAHOO_GEN_DEBUG) ; TQString message; - message = i18n( "User %1 has granted your authorization request." ).arg( who ); - KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); + message = i18n( "User %1 has granted your authorization request." ).tqarg( who ); + KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message ); if( contact( who ) ) contact( who )->setOnlineStatus( m_protocol->Online ); @@ -900,8 +900,8 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin kdDebug(YAHOO_GEN_DEBUG) ; TQString message; message = i18n( "User %1 has rejected your authorization request.\n%2" ) - .arg( who ).arg( msg ); - KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); + .tqarg( who ).tqarg( msg ); + KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message ); } void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQString &msg, const TQString &name ) @@ -932,7 +932,7 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ; Kopete::UI::ContactAddedNotifyDialog *dialog= - new Kopete::UI::ContactAddedNotifyDialog( user,TQString::null,this, hideFlags ); + new Kopete::UI::ContactAddedNotifyDialog( user,TQString(),this, hideFlags ); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); @@ -946,7 +946,7 @@ void YahooAccount::slotContactAddedNotifyDialogClosed( const TQString &user ) if(!dialog || !isConnected()) return; - m_session->sendAuthReply( user, dialog->authorized(), TQString::null ); + m_session->sendAuthReply( user, dialog->authorized(), TQString() ); if(dialog->added()) { @@ -995,24 +995,24 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr if ( kc ) { - Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat ); - Kopete::OnlineStatus oldStatus = kc->onlineStatus(); + Kopete::OnlineStatus newtqStatus = m_protocol->statusFromYahoo( stat ); + Kopete::OnlineStatus oldtqStatus = kc->onlinetqStatus(); - if( newStatus == m_protocol->Custom ) { + if( newtqStatus == m_protocol->Custom ) { if( away == 0 ) - newStatus =m_protocol->Online; + newtqStatus =m_protocol->Online; kc->setProperty( m_protocol->awayMessage, msg); } else kc->removeProperty( m_protocol->awayMessage ); // from original file - if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() ) + if( newtqStatus != m_protocol->Offline && oldtqStatus == m_protocol->Offline && contact(who) != myself() ) { //m_session->requestBuddyIcon( who ); // Try to get Buddy Icon if ( !myself()->property( Kopete::Global::Properties::self()->photo() ).isNull() && - myself()->onlineStatus() != m_protocol->Invisible && + myself()->onlinetqStatus() != m_protocol->Invisible && !kc->stealthed() ) { kc->sendBuddyIconUpdate( m_session->pictureFlag() ); @@ -1020,21 +1020,21 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr } } - //if( newStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) { - if( newStatus == m_protocol->Idle ) + //if( newtqStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) { + if( newtqStatus == m_protocol->Idle ) kc->setIdleTime( idle ? idle : 1 ); else kc->setIdleTime( 0 ); - kc->setOnlineStatus( newStatus ); + kc->setOnlineStatus( newtqStatus ); slotGotBuddyIconChecksum( who, pictureChecksum ); } } -void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthStatus state ) +void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state ) { - //kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state; + //kdDebug(YAHOO_GEN_DEBUG) << "Stealth tqStatus of " << who << "changed to " << state; YahooContact* kc = contact( who ); if ( kc == NULL ) { @@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl; - newMsgText.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); + newMsgText.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); // Replace Font tags regExp.setMinimal( true ); @@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::fromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); } } @@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::fromLatin1("<" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<" ) ); } } regExp.setPattern( "([^\"bui])>" ); @@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.replace( regExp, TQString::fromLatin1("\\1>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1>" ) ); } } // add closing tags when needed regExp.setMinimal( false ); regExp.setPattern( "(<b>.*)(?!</b>)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1</b>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); regExp.setPattern( "(<i>.*)(?!</i>)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1</i>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); regExp.setPattern( "(<u>.*)(?!</u>)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1</u>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); regExp.setPattern( "(<font.*)(?!</font>)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1</font>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); - newMsgText.replace( TQString::fromLatin1( "\r" ), TQString::fromLatin1( "<br/>" ) ); + newMsgText.tqreplace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); return newMsgText; } @@ -1143,7 +1143,7 @@ void YahooAccount::slotGotIm( const TQString &who, const TQString &msg, long tm, // FIXME to check if (tm == 0) - //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), Qt::LocalTime ); + //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime ); msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); @@ -1181,7 +1181,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm ) // FIXME: to check if (tm == 0) - //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), Qt::LocalTime ); + //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime ); msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); @@ -1192,7 +1192,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm ) TQString buzzMsgText = i18n("This string is shown when the user is buzzed by a contact", "Buzz"); Kopete::Message kmsg(msgDT, contact(who), justMe, buzzMsgText, Kopete::Message::Inbound, - Kopete::Message::PlainText, TQString::null, Kopete::Message::TypeAction); + Kopete::Message::PlainText, TQString(), Kopete::Message::TypeAction); TQColor fgColor( "gold" ); kmsg.setFg( fgColor ); @@ -1208,7 +1208,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo kdDebug(YAHOO_GEN_DEBUG) << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl; kdDebug(YAHOO_GEN_DEBUG) << "Members: " << members << endl; - if( !m_pendingConfInvites.contains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host + if( !m_pendingConfInvites.tqcontains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host m_pendingConfInvites.push_back( room ); else { @@ -1222,13 +1222,13 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo { if( *it != m_session->userId() ) { - m.append( TQString(", %1").arg( *it ) ); + m.append( TQString(", %1").tqarg( *it ) ); myMembers.push_back( *it ); } } if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to join a conference with %2.\n\nHis/her message: %3\n\nAccept?") - .arg(who).arg(m).arg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .tqarg(who).tqarg(m).tqarg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_session->joinConference( room, myMembers ); if( !m_conferences[room] ) @@ -1267,13 +1267,13 @@ void YahooAccount::prepareConference( const TQString &who ) char c = rand()%52; room += (c > 25) ? c + 71 : c + 65; } - room = TQString("%1-%2--").arg(accountId()).arg(room); + room = TQString("%1-%2--").tqarg(accountId()).tqarg(room); kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl; TQStringList buddies; // FIXME: to check - //QHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash<TQString,Kopete::Contact*>::ConstIterator it, itEnd = contacts().constEnd(); //for( it = contacts().constBegin(); it != itEnd; ++it ) //{ // buddies.push_back( it.value()->contactId() ); @@ -1321,7 +1321,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1329,7 +1329,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo YahooConferenceChatSession *session = m_conferences[room]; - TQString body = i18n( "%1 has declined to join the conference: \"%2\"").arg( who ).arg( msg ); + TQString body = i18n( "%1 has declined to join the conference: \"%2\"").tqarg( who ).tqarg( msg ); Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); session->appendMessage( message ); @@ -1338,7 +1338,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1355,7 +1355,7 @@ void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) void YahooAccount::slotConfUserLeave( const TQString & who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1390,7 +1390,7 @@ void YahooAccount::slotConfMessage( const TQString &who, const TQString &room, c { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1445,13 +1445,13 @@ void YahooAccount::slotGotYABRevision( long rev, bool merged ) if( merged ) { kdDebug(YAHOO_GEN_DEBUG) << "Merge Revision received: " << rev << endl; - configGroup()->writeEntry( "YABLastMerge", (Q_INT64)rev ); + configGroup()->writeEntry( "YABLastMerge", (TQ_INT64)rev ); m_YABLastMerge = rev; } else { kdDebug(YAHOO_GEN_DEBUG) << "Remote Revision received: " << rev << endl; - configGroup()->writeEntry( "YABLastRemoteRevision", (Q_INT64)rev ); + configGroup()->writeEntry( "YABLastRemoteRevision", (TQ_INT64)rev ); m_YABLastRemoteRevision = rev; } } @@ -1522,7 +1522,7 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQString& fileName) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_pendingFileTransfers.contains( transfer->info().internalId() ) ) + if( !m_pendingFileTransfers.tqcontains( transfer->info().internalId() ) ) return; m_pendingFileTransfers.remove( transfer->info().internalId() ); @@ -1531,7 +1531,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS //Create directory if it doesn't already exist TQDir dir; TQString path = TQFileInfo( fileName ).dirPath(); - for( int i = 1; i <= path.contains('/'); ++i ) + for( int i = 1; i <= path.tqcontains('/'); ++i ) { if( !dir.exists( path.section( '/', 0, i ) ) ) { @@ -1554,7 +1554,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info ) { - if( !m_pendingFileTransfers.contains( info.internalId() ) ) + if( !m_pendingFileTransfers.tqcontains( info.internalId() ) ) return; m_pendingFileTransfers.remove( info.internalId() ); @@ -1642,7 +1642,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec if ( cnt > 0 && from.isEmpty() ) { - TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", + TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", "You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); @@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec else if ( cnt > 0 ) { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; - TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").arg( from ).arg( subject ), + TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; @@ -1676,12 +1676,12 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) return; } - if( m_pendingWebcamInvites.contains( who ) ) + if( m_pendingWebcamInvites.tqcontains( who ) ) return; m_pendingWebcamInvites.append( who ); - if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ), + if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").tqarg( who ), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_pendingWebcamInvites.remove( who ); @@ -1690,7 +1690,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) } void YahooAccount::slotWebcamNotAvailable( const TQString &who ) { - KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) ); + KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").tqarg(who), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotWebcamImage( const TQString& who, const TQPixmap& image ) @@ -1723,7 +1723,7 @@ void YahooAccount::slotGotBuddyIconChecksum(const TQString &who, int checksum) } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) ) ) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not request it again." << endl; return; @@ -1741,7 +1741,7 @@ void YahooAccount::slotGotBuddyIconInfo(const TQString &who, KURL url, int check } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) )) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) )) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not download it again." << endl; return; @@ -1777,7 +1777,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) myself()->removeProperty( YahooProtocol::protocol()->iconExpire ); if ( m_session ) - m_session->setPictureStatus( Yahoo::NoPicture ); + m_session->setPicturetqStatus( Yahoo::NoPicture ); } else { @@ -1791,7 +1791,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n( "<qt>The selected buddy icon could not be opened. <br />Please set a new buddy icon.</qt>" ), i18n( "Yahoo Plugin" ) ); return; } - image = image.smoothScale( 96, 96, TQImage::ScaleMin ); + image = image.smoothScale( 96, 96, TQ_ScaleMin ); if(image.width() < image.height()) { image = image.copy((image.width()-image.height())/2, 0, 96, 96); @@ -1827,7 +1827,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) configGroup()->writeEntry( "iconLocalUrl", newlocation ); if ( checksum != static_cast<uint>(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) || - TQDateTime::currentDateTime().toTime_t() > expire ) + TQDateTime::tqcurrentDateTime().toTime_t() > expire ) { myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); configGroup()->writeEntry( "iconCheckSum", checksum ); @@ -1848,7 +1848,7 @@ void YahooAccount::slotBuddyIconChanged( const TQString &url, int expires ) myself()->setProperty( YahooProtocol::protocol()->iconExpire , expires ); configGroup()->writeEntry( "iconRemoteUrl", url ); configGroup()->writeEntry( "iconExpire", expires ); - m_session->setPictureStatus( Yahoo::Picture ); + m_session->setPicturetqStatus( Yahoo::Picture ); m_session->sendPictureChecksum( TQString(), checksum ); } } @@ -1893,7 +1893,7 @@ void YahooAccount::slotWebcamViewerJoined( const TQString &viewer ) void YahooAccount::slotWebcamViewerRequest( const TQString &viewer ) { if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. Grant access?") - .arg(viewer), TQString::null, i18n("Accept"), i18n("Ignore") ) ) + .tqarg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) ) m_session->grantWebcamAccess( viewer ); } @@ -1928,52 +1928,52 @@ void YahooAccount::slotWebcamPaused( const TQString &who ) void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus &status, const TQString &reason) { kdDebug(YAHOO_GEN_DEBUG) ; - if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() != Kopete::OnlineStatus::Offline ) { if( !reason.isEmpty() ) m_session->setStatusMessageOnConnect( reason ); connect( status ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) { disconnect(); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 2 && !reason.isEmpty()) { - slotGoStatus( 99, reason ); + slotGotqStatus( 99, reason ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 99 && reason.isEmpty()) { - slotGoStatus( 2, reason ); + slotGotqStatus( 2, reason ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline ) { - slotGoStatus( status.internalStatus(), reason ); + slotGotqStatus( status.internalStatus(), reason ); } } /* FIXME: not ported yet void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage) { - int currentStatus = myself()->onlineStatus().internalStatus(); - m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(), - (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); + int currenttqStatus = myself()->onlinetqStatus().internalStatus(); + m_session->changetqStatus( Yahoo::tqStatus( currenttqStatus ), statusMessage.message(), + (currenttqStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); myself()->setStatusMessage( statusMessage ); } */ void YahooAccount::slotOpenInbox() { - KRun::runURL( KURL( TQString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::tqfromLatin1("http://mail.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotOpenYAB() { - KRun::runURL( KURL( TQString::fromLatin1("http://address.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::tqfromLatin1("http://address.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotEditOwnYABEntry() diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 5332794f..4269a6cd 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -21,7 +21,7 @@ #ifndef YAHOOACCOUNT_H #define YAHOOACCOUNT_H -// Qt +// TQt #include <tqobject.h> #include <tqmap.h> #include <tqpixmap.h> @@ -64,12 +64,13 @@ namespace KIO{ class YahooAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: enum SignalConnectionType { MakeConnections, DeleteConnections }; - YahooAccount(YahooProtocol *parent,const TQString& accountID, const char *name = 0); + YahooAccount(YahooProtocol *tqparent,const TQString& accountID, const char *name = 0); ~YahooAccount(); /* @@ -92,7 +93,7 @@ public: /** * Returns true if contact @p id is on the server-side contact list */ - bool isOnServer(const TQString &id) { return IDs.contains(id); } + bool isOnServer(const TQString &id) { return IDs.tqcontains(id); } /** * Returns true if we have the server-side contact list @@ -135,7 +136,7 @@ public slots: virtual void disconnect(); /** Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString()); signals: /** @@ -152,7 +153,7 @@ protected: /** * Adds our Yahoo contact to a metacontact */ - virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); virtual bool createChatContact( const TQString &nick ); @@ -175,7 +176,7 @@ protected slots: void slotJoinChatRoom(); void slotChatCategorySelected( const Yahoo::ChatCategory &category ); - void slotGoStatus(int status, const TQString &awayMessage = TQString()); + void slotGotqStatus(int status, const TQString &awayMessage = TQString()); void slotLoginResponse(int succ, const TQString &url); void slotDisconnected(); void slotLoginFailed(); @@ -191,7 +192,7 @@ protected slots: void slotGotIgnore(const TQStringList &); void slotGotIdentities(const TQStringList &); void slotStatusChanged(const TQString &who, int stat, const TQString &msg, int away, int idle, int pictureChecksum); - void slotStealthStatusChanged(const TQString &who, Yahoo::StealthStatus state); + void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus state); void slotGotIm(const TQString &who, const TQString &msg, long tm, int stat); void slotGotBuzz(const TQString &who, long tm); void slotGotConfInvite(const TQString &who, const TQString &room, const TQString &msg, const TQStringList &members); @@ -261,7 +262,7 @@ private: * internal (to the plugin) controls/flags * This should be kept in sync with server - if a buddy is removed, this should be changed accordingly. */ - TQMap<TQString, QPair<TQString, TQString> > IDs; + TQMap<TQString, TQPair<TQString, TQString> > IDs; /** * Conferences list, maped by room name (id) diff --git a/kopete/protocols/yahoo/yahooaddcontact.cpp b/kopete/protocols/yahoo/yahooaddcontact.cpp index af3e1bc5..df9bca6d 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.cpp +++ b/kopete/protocols/yahoo/yahooaddcontact.cpp @@ -33,9 +33,9 @@ #include "yahooaccount.h" // Yahoo Add Contact page -YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *parent, const char *name): AddContactPage(parent, name) +YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *tqparent, const char *name): AddContactPage(tqparent, name) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <parent>, " << name << ")" << endl; + kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(<owner>, <tqparent>, " << name << ")" << endl; (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new YahooAddContactBase(this); diff --git a/kopete/protocols/yahoo/yahooaddcontact.h b/kopete/protocols/yahoo/yahooaddcontact.h index 796c82ce..ad07eb69 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.h +++ b/kopete/protocols/yahoo/yahooaddcontact.h @@ -34,13 +34,14 @@ namespace Kopete { class MetaContact; } class YahooAddContact: public AddContactPage { Q_OBJECT + TQ_OBJECT private: YahooProtocol *theProtocol; YahooAddContactBase *theDialog; public: - YahooAddContact(YahooProtocol *owner, TQWidget *parent = 0, const char *name = 0); + YahooAddContact(YahooProtocol *owner, TQWidget *tqparent = 0, const char *name = 0); ~YahooAddContact(); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 5402919c..ef0bf09e 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -127,7 +127,7 @@ void YahooChatSession::slotDisplayPictureChanged() int sz=22; // get the size of the toolbar were the aciton is plugged. // if you know a better way to get the toolbar, let me know - KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; + KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. diff --git a/kopete/protocols/yahoo/yahoochatsession.h b/kopete/protocols/yahoo/yahoochatsession.h index 43ab7288..e20bb257 100644 --- a/kopete/protocols/yahoo/yahoochatsession.h +++ b/kopete/protocols/yahoo/yahoochatsession.h @@ -30,6 +30,7 @@ class TQLabel; class KOPETE_EXPORT YahooChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: YahooChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 ); diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8d34689b..b9b510a9 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -95,7 +95,7 @@ void YahooConferenceChatSession::slotInviteOthers() Kopete::Contact *myself = account()->myself(); for( ; it.current(); ++it ) { - if( (*it) != myself && !members().contains( *it ) ) + if( (*it) != myself && !members().tqcontains( *it ) ) buddies.push_back( (*it)->contactId() ); } diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.h b/kopete/protocols/yahoo/yahooconferencemessagemanager.h index 086d229a..1f54ac5b 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.h +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.h @@ -32,6 +32,7 @@ class KActionMenu; class YahooConferenceChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: YahooConferenceChatSession( const TQString &m_yahooRoom, Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 ); diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index d26eb739..377103c8 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -114,7 +114,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status) protocol() , status.internalStatus()+1000 , status.overlayIcons() + TQStringList("yahoo_stealthed") , - i18n("%1|Stealthed").arg( status.description() ) ) ); + i18n("%1|Stealthed").tqarg( status.description() ) ) ); } else if( !m_stealthed && status.internalStatus() > 999 )// Stealthed -> Not Stealthed Contact::setOnlineStatus( static_cast< YahooProtocol *>( protocol() )->statusFromYahoo( status.internalStatus() - 1000 ) ); @@ -128,7 +128,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status) void YahooContact::setStealthed( bool stealthed ) { m_stealthed = stealthed; - setOnlineStatus( onlineStatus() ); + setOnlineStatus( onlinetqStatus() ); } bool YahooContact::stealthed() @@ -187,7 +187,7 @@ void YahooContact::sync(unsigned int flags) bool YahooContact::isOnline() const { //kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; + return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; } bool YahooContact::isReachable() @@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); } } @@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); } } @@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); } } @@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); } } @@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); } } @@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); } } @@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.replace( regExp, TQString::fromLatin1("\\2") ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\2") ); } } // convert escaped chars - newMsg.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); - newMsg.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); - newMsg.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); - newMsg.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); - newMsg.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); - newMsg.replace( TQString::fromLatin1( "<br />" ), TQString::fromLatin1( "\r" ) ); - newMsg.replace( TQString::fromLatin1( "<br/>" ), TQString::fromLatin1( "\r" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); return newMsg; } @@ -447,7 +447,7 @@ void YahooContact::slotUserProfile() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString profileSiteString = TQString::fromLatin1("http://profiles.yahoo.com/") + userId(); + TQString profileSiteString = TQString::tqfromLatin1("http://profiles.yahoo.com/") + userId(); KRun::runURL( KURL( profileSiteString ) , "text/html" ); } @@ -467,7 +467,7 @@ void YahooContact::stealthContact() stealthSettingDialog->setMainWidget( stealthWidget ); // Prepare dialog - if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible ) { stealthWidget->radioOffline->setEnabled( true ); stealthWidget->radioOffline->setChecked( true ); @@ -490,7 +490,7 @@ void YahooContact::stealthContact() m_account->yahooSession()->stealthContact( m_userId, Yahoo::StealthPermOffline, Yahoo::StealthActive ); // Apply temporary setting - if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible ) { if( stealthWidget->radioOnline->isChecked() ) { @@ -518,7 +518,7 @@ void YahooContact::buzzContact() Kopete::Message msg = Kopete::Message( manager(Kopete::Contact::CannotCreate)->myself() , manager(Kopete::Contact::CannotCreate)->members(), i18n("Buzzz!!!"), Kopete::Message::Outbound, Kopete::Message::PlainText, - TQString::null , Kopete::Message::TypeAction); + TQString() , Kopete::Message::TypeAction); view->appendMessage( msg ); } } @@ -549,7 +549,7 @@ void YahooContact::setDisplayPicture(const TQByteArray &data, int checksum) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << data.size() << endl; - TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); TQFile f( newlocation ); @@ -590,8 +590,8 @@ const YABEntry *YahooContact::yabEntry() void YahooContact::slotEmitDisplayPictureChanged() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; - setProperty( Kopete::Global::Properties::self()->photo(), TQString::null ); + TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); } @@ -607,7 +607,7 @@ void YahooContact::inviteWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } m_account->yahooSession()->sendWebcamInvite( m_userId ); @@ -662,7 +662,7 @@ void YahooContact::requestWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } @@ -763,8 +763,8 @@ void YahooContact::writeYABEntry() setProperty( YahooProtocol::protocol()->propWorkURL, m_YABEntry->workURL ); // Miscellanous - setProperty( YahooProtocol::protocol()->propBirthday, m_YABEntry->birthday.toString( Qt::ISODate ) ); - setProperty( YahooProtocol::protocol()->propAnniversary, m_YABEntry->anniversary.toString( Qt::ISODate ) ); + setProperty( YahooProtocol::protocol()->propBirthday, TQString(m_YABEntry->birthday.toString( Qt::ISODate )) ); + setProperty( YahooProtocol::protocol()->propAnniversary, TQString(m_YABEntry->anniversary.toString( Qt::ISODate )) ); setProperty( YahooProtocol::protocol()->propNotes, m_YABEntry->notes ); setProperty( YahooProtocol::protocol()->propAdditional1, m_YABEntry->additional1 ); setProperty( YahooProtocol::protocol()->propAdditional2, m_YABEntry->additional2 ); @@ -838,5 +838,5 @@ void YahooContact::readYABEntry() #include "yahoocontact.moc" // vim: set noet ts=4 sts=4 sw=4: -//kate: space-indent off; replace-tabs off; indent-mode csands; +//kate: space-indent off; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h index 092a2c93..e9f8b517 100644 --- a/kopete/protocols/yahoo/yahoocontact.h +++ b/kopete/protocols/yahoo/yahoocontact.h @@ -41,6 +41,7 @@ struct KURL; class YahooContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact ); ~YahooContact(); @@ -53,7 +54,7 @@ public: virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData ); void setOnlineStatus(const Kopete::OnlineStatus &status); - void setYahooStatus( const Kopete::OnlineStatus& ); + void setYahootqStatus( const Kopete::OnlineStatus& ); void setStealthed( bool ); bool stealthed(); @@ -77,7 +78,7 @@ public slots: virtual void slotUserInfo(); virtual void slotSendFile( const KURL &file ); virtual void deleteContact(); - virtual void sendFile( const KURL &sourceURL = KURL(), const TQString &fileName = TQString::null, uint fileSize = 0L ); + virtual void sendFile( const KURL &sourceURL = KURL(), const TQString &fileName = TQString(), uint fileSize = 0L ); void slotUserProfile(); void stealthContact(); void requestWebcam(); diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index c2508a58..b43fb476 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -47,7 +47,7 @@ #include "yahooeditaccount.h" // Yahoo Add Contact page -YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent, const char* /*name*/): YahooEditAccountBase(parent), KopeteEditAccountWidget(theAccount) +YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent, const char* /*name*/): YahooEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -148,7 +148,7 @@ Kopete::Account *YahooEditAccount::apply() } else { - yahooAccount->setBuddyIcon( KURL( TQString::null ) ); + yahooAccount->setBuddyIcon( KURL( TQString() ) ); } // Global Identity @@ -164,7 +164,7 @@ void YahooEditAccount::slotOpenRegister() void YahooEditAccount::slotSelectPicture() { - KURL file = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Yahoo Buddy Icon" ) ); + KURL file = KFileDialog::getImageOpenURL( TQString(), this, i18n( "Yahoo Buddy Icon" ) ); if ( file.isEmpty() ) return; diff --git a/kopete/protocols/yahoo/yahooeditaccount.h b/kopete/protocols/yahoo/yahooeditaccount.h index a64d88f7..47a445f8 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.h +++ b/kopete/protocols/yahoo/yahooeditaccount.h @@ -35,13 +35,14 @@ namespace Kopete { class Account; } class YahooEditAccount: public YahooEditAccountBase, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT private: YahooProtocol *theProtocol; Kopete::UI::PasswordWidget *mPasswordWidget; public: - YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); + YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index dc2e3cdc..fc132701 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory<YahooProtocol> YahooProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_yahoo, YahooProtocolFactory( "kopete_yahoo" ) ) -YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & ) - : Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ), - Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), - Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), +YahooProtocol::YahooProtocol( TQObject *tqparent, const char *name, const TQStringList & ) + : Kopete::Protocol( YahooProtocolFactory::instance(), tqparent, name ), + Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), + Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ), Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", i18n( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", i18n( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ), @@ -55,51 +55,51 @@ YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQString Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", i18n( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ), Connecting( Kopete::OnlineStatus::Connecting,2, this, 555, "yahoo_connecting", i18n( "Connecting" ) ), awayMessage(Kopete::Global::Properties::self()->awayMessage()), - iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString::null, true, false, true), - iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString::null, true, false, true), - iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString::null, true, false, true), + iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString(), true, false, true), + iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString(), true, false, true), + iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString(), true, false, true), propfirstName(Kopete::Global::Properties::self()->firstName()), propSecondName(), propLastName(Kopete::Global::Properties::self()->lastName()), propNickName(Kopete::Global::Properties::self()->nickName()), - propTitle("YABTitle", i18n("Title"), TQString::null, true, false), + propTitle("YABTitle", i18n("Title"), TQString(), true, false), propPhoneMobile(Kopete::Global::Properties::self()->privateMobilePhone()), propEmail(Kopete::Global::Properties::self()->emailAddress()), - propYABId("YABId", i18n("YAB Id"), TQString::null, true, false, true), - propPager("YABPager", i18n("Pager number"), TQString::null, true, false), - propFax("YABFax", i18n("Fax number"), TQString::null, true, false), - propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString::null, true, false), - propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString::null, true, false), - propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString::null, true, false), - propImAIM("YABIMAIM", i18n("AIM"), TQString::null, true, false), - propImICQ("YABIMICQ", i18n("ICQ"), TQString::null, true, false), - propImMSN("YABIMMSN", i18n("MSN"), TQString::null, true, false), - propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString::null, true, false), - propImSkype("YABIMSkype", i18n("Skype"), TQString::null, true, false), - propImIRC("YABIMIRC", i18n("IRC"), TQString::null, true, false), - propImQQ("YABIMQQ", i18n("QQ"), TQString::null, true, false), - propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString::null, true, false), - propPrivateCity("YABPrivateCity", i18n("Private City"), TQString::null, true, false), - propPrivateState("YABPrivateState", i18n("Private State"), TQString::null, true, false), - propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString::null, true, false), - propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString::null, true, false), + propYABId("YABId", i18n("YAB Id"), TQString(), true, false, true), + propPager("YABPager", i18n("Pager number"), TQString(), true, false), + propFax("YABFax", i18n("Fax number"), TQString(), true, false), + propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString(), true, false), + propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString(), true, false), + propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString(), true, false), + propImAIM("YABIMAIM", i18n("AIM"), TQString(), true, false), + propImICQ("YABIMICQ", i18n("ICQ"), TQString(), true, false), + propImMSN("YABIMMSN", i18n("MSN"), TQString(), true, false), + propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString(), true, false), + propImSkype("YABIMSkype", i18n("Skype"), TQString(), true, false), + propImIRC("YABIMIRC", i18n("IRC"), TQString(), true, false), + propImQQ("YABIMQQ", i18n("QQ"), TQString(), true, false), + propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString(), true, false), + propPrivateCity("YABPrivateCity", i18n("Private City"), TQString(), true, false), + propPrivateState("YABPrivateState", i18n("Private State"), TQString(), true, false), + propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString(), true, false), + propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString(), true, false), propPrivatePhone(Kopete::Global::Properties::self()->privatePhone()), - propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString::null, true, false), - propCorporation("YABCorporation", i18n("Corporation"), TQString::null, true, false), - propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString::null, true, false), - propWorkCity("YABWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkState("YABWorkState", i18n("Work State"), TQString::null, true, false), - propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString::null, true, false), - propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString::null, true, false), + propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString(), true, false), + propCorporation("YABCorporation", i18n("Corporation"), TQString(), true, false), + propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString(), true, false), + propWorkCity("YABWorkCity", i18n("Work City"), TQString(), true, false), + propWorkState("YABWorkState", i18n("Work State"), TQString(), true, false), + propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString(), true, false), + propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString(), true, false), propWorkPhone(Kopete::Global::Properties::self()->workPhone()), - propWorkURL("YABWorkURL", i18n("Work URL"), TQString::null, true, false), - propBirthday("YABBirthday", i18n("Birthday"), TQString::null, true, false), - propAnniversary("YABAnniversary", i18n("Anniversary"), TQString::null, true, false), - propNotes("YABNotes", i18n("Notes"), TQString::null, true, false), - propAdditional1("YABAdditional1", i18n("Additional 1"), TQString::null, true, false), - propAdditional2("YABAdditional2", i18n("Additional 2"), TQString::null, true, false), - propAdditional3("YABAdditional3", i18n("Additional 3"), TQString::null, true, false), - propAdditional4("YABAdditional4", i18n("Additional 4"), TQString::null, true, false) + propWorkURL("YABWorkURL", i18n("Work URL"), TQString(), true, false), + propBirthday("YABBirthday", i18n("Birthday"), TQString(), true, false), + propAnniversary("YABAnniversary", i18n("Anniversary"), TQString(), true, false), + propNotes("YABNotes", i18n("Notes"), TQString(), true, false), + propAdditional1("YABAdditional1", i18n("Additional 1"), TQString(), true, false), + propAdditional2("YABAdditional2", i18n("Additional 2"), TQString(), true, false), + propAdditional3("YABAdditional3", i18n("Additional 3"), TQString(), true, false), + propAdditional4("YABAdditional4", i18n("Additional 4"), TQString(), true, false) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -187,15 +187,15 @@ Kopete::Contact *YahooProtocol::deserializeContact( Kopete::MetaContact *metaCon return theAccount->contacts()[contactId]; } -AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * parent , Kopete::Account* ) +AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * tqparent , Kopete::Account* ) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<parent>)" << endl; - return new YahooAddContact(this, parent); + kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget(<tqparent>)" << endl; + return new YahooAddContact(this, tqparent); } -KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new YahooEditAccount(this, account, parent); + return new YahooEditAccount(this, account, tqparent); } Kopete::Account *YahooProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index 4b597243..f454e4c6 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -42,8 +42,9 @@ namespace Kopete { class OnlineStatus; } class YahooProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - YahooProtocol( TQObject *parent, const char *name, const TQStringList &args ); + YahooProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); ~YahooProtocol(); //Online Statuses @@ -132,8 +133,8 @@ public: Kopete::OnlineStatus statusFromYahoo( int status ); public slots: - virtual AddContactPage *createAddContactWidget(TQWidget * parent, Kopete::Account* a); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget(TQWidget * tqparent, Kopete::Account* a); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 7d50e900..5ea7b340 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -37,8 +37,8 @@ #include "yahooverifyaccount.h" #include "yahooaccount.h" -YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, +YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, Apply, true ) { mTheAccount = account; diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h index c179a4c6..c78d6e11 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.h +++ b/kopete/protocols/yahoo/yahooverifyaccount.h @@ -31,12 +31,13 @@ class KTempFile; class YahooVerifyAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT private: Kopete::Account *mTheAccount; KTempFile *mFile; YahooVerifyAccountBase *mTheDialog; public: - YahooVerifyAccount(Kopete::Account *account, TQWidget *parent = 0, const char *name = 0); + YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0); ~YahooVerifyAccount(); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahoowebcam.h b/kopete/protocols/yahoo/yahoowebcam.h index cd4cfd21..09b519ed 100644 --- a/kopete/protocols/yahoo/yahoowebcam.h +++ b/kopete/protocols/yahoo/yahoowebcam.h @@ -31,9 +31,10 @@ namespace Kopete { } } -class YahooWebcam : public QObject +class YahooWebcam : public TQObject { Q_OBJECT + TQ_OBJECT public: YahooWebcam( YahooAccount *account ); ~YahooWebcam(); |