adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-29 06:21:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove CString::ToKBytes()

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1039 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-05-05 21:39:09 +00:00
parent 4ada00f542
commit 6857394d71
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client.cpp
+2 -2
View File
@@ -1079,7 +1079,7 @@ void CClient::UserCommand(const CString& sLine) {
Table.AddRow();
Table.SetCell("Type", "Sending");
Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
Table.SetCell("Speed", CString::ToKBytes(pSock->GetAvgWrite() / 1000.0));
Table.SetCell("Speed", CString((int)(pSock->GetAvgWrite() / 1024.0)) + " KiB/s");
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("File", pSock->GetFileName());
@@ -1089,7 +1089,7 @@ void CClient::UserCommand(const CString& sLine) {
Table.AddRow();
Table.SetCell("Type", "Getting");
Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
Table.SetCell("Speed", CString::ToKBytes(pSock->GetAvgRead() / 1000.0));
Table.SetCell("Speed", CString((int)(pSock->GetAvgRead() / 1024.0)) + " KiB/s");
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("File", pSock->GetFileName());
DCCSock.cpp
+4 -2
View File
@@ -77,9 +77,11 @@ void CDCCSock::Disconnected() {
m_pUser->PutModule(m_sModuleName, sStart + "TooMuchData!");
} else if (m_uBytesSoFar == m_uFileSize) {
if (m_bSend) {
m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Sent [" + m_sLocalFile + "] at [" + CString::ToKBytes(GetAvgWrite() / 1000.0) + "]");
m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Sent [" + m_sLocalFile +
"] at [" + CString((int) (GetAvgWrite() / 1024.0)) + " KiB/s ]");
} else {
m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Saved to [" + m_sLocalFile + "] at [" + CString::ToKBytes(GetAvgRead() / 1000.0) + "]");
m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Saved to [" + m_sLocalFile +
"] at [" + CString((int) (GetAvgRead() / 1024.0)) + " KiB/s ]");
}
} else {
m_pUser->PutModule(m_sModuleName, sStart + "Incomplete!");
String.cpp
-6
View File
@@ -846,12 +846,6 @@ CString CString::ToPercent(double d) {
return szRet;
}
CString CString::ToKBytes(double d) {
char szRet[32];
snprintf(szRet, 32, "%.0f K/s", d);
return szRet;
}
CString CString::ToByteStr(unsigned long long d) {
const unsigned long long KiB = 1024;
const unsigned long long MiB = KiB * 1024;
String.h
-1
View File
@@ -128,7 +128,6 @@ public:
#endif
static CString ToPercent(double d);
static CString ToKBytes(double d);
static CString ToByteStr(unsigned long long d);
bool ToBool() const;