diff options
| author |  Fabio Bas | 2008-10-04 09:51:37 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-10-04 09:51:37 +0000 |
| commit | 9e9d7b4a5d772dd8c9a8f0c7761138a2012241d9 (patch) | |
| tree | 207913b09ecbe03c8567a6ae6f74468e41c7aad0 /src/modules/dcc | |
| parent | improved translations, big thanks to Caladiel (diff) | |
| download | KVIrc-9e9d7b4a5d772dd8c9a8f0c7761138a2012241d9.tar.gz KVIrc-9e9d7b4a5d772dd8c9a8f0c7761138a2012241d9.tar.bz2 KVIrc-9e9d7b4a5d772dd8c9a8f0c7761138a2012241d9.zip | |
away/back signals in trayicon fixed
dcc big filesize support patch partially ported from 3.4
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2641 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/broker.cpp | 6 | ||||
| -rw-r--r-- | src/modules/dcc/send.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/send.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 2dec808e1..17522220d 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -479,7 +479,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) if(dcc->bIsIncomingAvatar) { bool bOk; - uint size = dcc->szFileSize.toUInt(&bOk); + unsigned long size = dcc->szFileSize.toULong(&bOk); if(bOk) { if(size>=KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize)) { cancelDcc(0,dcc); @@ -504,7 +504,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) "The connection target will be host <b>%6</b> on port <b>%7</b><br>" \ ,"dcc" \ ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg( - dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toInt())).arg( + dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toULong())).arg( dcc->szIp).arg(dcc->szPort); } else { @@ -517,7 +517,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) "You will be the passive side of the connection.<br>" \ ,"dcc" \ ).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg( - dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toInt())); + dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toULong())); } if(dcc->bIsIncomingAvatar) diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index d6c42abb2..67fe456d4 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -753,7 +753,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc) m_eGeneralStatus = Connecting; bool bOk; - m_uTotalFileSize = dcc->bRecvFile ? dcc->szFileSize.toUInt(&bOk) : dcc->szLocalFileSize.toUInt(&bOk); + m_uTotalFileSize = dcc->bRecvFile ? dcc->szFileSize.toULong(&bOk) : dcc->szLocalFileSize.toULong(&bOk); if(!bOk)m_uTotalFileSize = 0; if(m_pDescriptor->bRecvFile) diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h index 6dd40ee10..bc55a953e 100644 --- a/src/modules/dcc/send.h +++ b/src/modules/dcc/send.h @@ -191,7 +191,7 @@ private: kvi_time_t m_tTransferStartTime; kvi_time_t m_tTransferEndTime; // cached stats - unsigned int m_uTotalFileSize; // total file size to transfer + unsigned long m_uTotalFileSize; // total file size to transfer unsigned int m_uMaxBandwidth; KviDccFileTransferBandwidthDialog * m_pBandwidthDialog; |