diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/msn/msnfiletransfersocket.cpp | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip | |
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/msn/msnfiletransfersocket.cpp')
| -rw-r--r-- | kopete/protocols/msn/msnfiletransfersocket.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index c07fad06..c08bd3eb 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -40,8 +40,8 @@ using namespace KNetwork; -MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* parent) - : MSNSocket(parent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) +MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* tqparent) + : MSNSocket(tqparent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) { m_handle=handle; m_kopeteTransfer=0l; @@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection() void MSNFileTransferSocket::slotTimer() { - if(onlineStatus() != Disconnected) + if(onlinetqStatus() != Disconnected) return; kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl; if( m_kopeteTransfer) @@ -331,7 +331,7 @@ TQString MSNFileTransferSocket::invitationHead() TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer return TQString( MSNInvitation::invitationHead()+ - "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n" + "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.tqfindRev( '/' ) - 1 ) +"\r\n" "Application-FileSize: "+ TQString::number(size()) +"\r\n\r\n").utf8(); } @@ -340,7 +340,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); TQString command=rx.cap(1); - if( msg.contains("Invitation-Command: INVITE") ) + if( msg.tqcontains("Invitation-Command: INVITE") ) { rx=TQRegExp("Application-File: ([^\\r\\n]*)"); rx.search(msg); @@ -351,13 +351,13 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) MSNInvitation::parseInvitation(msg); //for the cookie - Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString::null, TQString::number( cookie() ) ); + Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString(), TQString::number( cookie() ) ); TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQT_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) ); TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); } - else if( msg.contains("Invitation-Command: ACCEPT") ) + else if( msg.tqcontains("Invitation-Command: ACCEPT") ) { if(incoming()) { |