From 17eb411842694f8b8b3ce36f84f692eba1c600d1 Mon Sep 17 00:00:00 2001 From: "sinpowei@gmail.com" Date: Wed, 30 Nov 2011 06:40:16 +0000 Subject: [PATCH] --- build/win32/vs2010/sokit.vcxproj | 3 +++ build/win32/vs2010/sokit.vcxproj.filters | 12 ++++++++++++ src/sokit/baseform.cpp | 20 ++++++++++---------- src/sokit/baseform.h | 4 ++-- src/sokit/clientform.cpp | 4 ++-- src/sokit/clientskt.cpp | 6 +++--- src/sokit/clientskt.h | 4 ++-- src/sokit/serverform.cpp | 8 ++++---- src/sokit/serverskt.cpp | 6 +++--- src/sokit/serverskt.h | 4 ++-- src/sokit/transferform.cpp | 4 ++-- src/sokit/transferskt.cpp | 12 ++++++------ src/sokit/transferskt.h | 4 ++-- 13 files changed, 53 insertions(+), 38 deletions(-) diff --git a/build/win32/vs2010/sokit.vcxproj b/build/win32/vs2010/sokit.vcxproj index a2eec41..f7d44c4 100644 --- a/build/win32/vs2010/sokit.vcxproj +++ b/build/win32/vs2010/sokit.vcxproj @@ -284,6 +284,9 @@ .\..\..\..\tmp\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\..\..\..\tmp\ui_%(Filename).h" "%(FullPath)" + + + true diff --git a/build/win32/vs2010/sokit.vcxproj.filters b/build/win32/vs2010/sokit.vcxproj.filters index fdf9621..6c1d7a2 100644 --- a/build/win32/vs2010/sokit.vcxproj.filters +++ b/build/win32/vs2010/sokit.vcxproj.filters @@ -33,6 +33,9 @@ cpp;moc False + + {de80990b-4b4f-4245-b787-dc984296caaa} + @@ -227,6 +230,15 @@ resource + + doc + + + doc + + + doc + diff --git a/src/sokit/baseform.cpp b/src/sokit/baseform.cpp index 8eabf7c..de1d9cf 100644 --- a/src/sokit/baseform.cpp +++ b/src/sokit/baseform.cpp @@ -148,22 +148,22 @@ void BaseForm::select() } } -void BaseForm::countRecv(quint32 bytes) +void BaseForm::countRecv(qint32 bytes) { - if (bytes > 0) - m_cntRecv += bytes; - else + if (bytes < 0) m_cntRecv = 0; + else + m_cntRecv += bytes; m_labRecv->setText(QString::number(m_cntRecv)); } -void BaseForm::countSend(quint32 bytes) +void BaseForm::countSend(qint32 bytes) { - if (bytes > 0) - m_cntSend += bytes; - else + if (bytes < 0) m_cntSend = 0; + else + m_cntSend += bytes; m_labSend->setText(QString::number(m_cntSend)); } @@ -181,8 +181,8 @@ void BaseForm::clear() m_logger.clear(); lock(); - countRecv(0); - countSend(0); + countRecv(-1); + countSend(-1); unlock(); } diff --git a/src/sokit/baseform.h b/src/sokit/baseform.h index e43d008..01e2ff2 100644 --- a/src/sokit/baseform.h +++ b/src/sokit/baseform.h @@ -52,8 +52,8 @@ protected slots: void select(); void hotOutput(); - void countRecv(quint32 bytes); - void countSend(quint32 bytes); + void countRecv(qint32 bytes); + void countSend(qint32 bytes); void listerAdd(const QString& caption); void listerRemove(const QString& caption); diff --git a/src/sokit/clientform.cpp b/src/sokit/clientform.cpp index 4b118b4..a76b7fe 100644 --- a/src/sokit/clientform.cpp +++ b/src/sokit/clientform.cpp @@ -151,8 +151,8 @@ bool ClientForm::plug(bool istcp) connect(m_client, SIGNAL(unpluged()), this, SLOT(unpluged())); connect(m_client, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); connect(m_client, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); - connect(m_client, SIGNAL(countRecv(quint32)), this, SLOT(countRecv(quint32))); - connect(m_client, SIGNAL(countSend(quint32)), this, SLOT(countSend(quint32))); + connect(m_client, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); + connect(m_client, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); skt = m_client; } diff --git a/src/sokit/clientskt.cpp b/src/sokit/clientskt.cpp index dc842ab..2d9625a 100644 --- a/src/sokit/clientskt.cpp +++ b/src/sokit/clientskt.cpp @@ -37,12 +37,12 @@ void ClientSkt::setError(const QString& err) void ClientSkt::recordRecv(qint32 bytes) { - emit countRecv((quint32)bytes); + emit countRecv(bytes); } void ClientSkt::recordSend(qint32 bytes) { - emit countSend((quint32)bytes); + emit countSend(bytes); } void ClientSkt::send(const QString& data) @@ -61,7 +61,7 @@ void ClientSkt::send(const QString& data) void ClientSkt::dump(const char* buf, qint32 len, bool isSend) { - emit dumpbin(QString("DAT %1").arg(isSend?"<<<<":">>>>"), buf, (quint32)len); + emit dumpbin(QString("DAT %1").arg(isSend?"<---":"--->"), buf, (quint32)len); } void ClientSkt::show(const QString& msg) diff --git a/src/sokit/clientskt.h b/src/sokit/clientskt.h index e7c2aae..d3f14c9 100644 --- a/src/sokit/clientskt.h +++ b/src/sokit/clientskt.h @@ -27,8 +27,8 @@ class ClientSkt : public QObject void message(const QString& msg); void dumpbin(const QString& title, const char* data, quint32 len); - void countRecv(quint32 bytes); - void countSend(quint32 bytes); + void countRecv(qint32 bytes); + void countSend(qint32 bytes); protected: void dump(const char* buf, qint32 len, bool isSend); diff --git a/src/sokit/serverform.cpp b/src/sokit/serverform.cpp index 157396e..b4716bb 100644 --- a/src/sokit/serverform.cpp +++ b/src/sokit/serverform.cpp @@ -81,15 +81,15 @@ bool ServerForm::initForm() connect(&m_tcp, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(&m_tcp, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); connect(&m_tcp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); - connect(&m_tcp, SIGNAL(countRecv(quint32)), this, SLOT(countRecv(quint32))); - connect(&m_tcp, SIGNAL(countSend(quint32)), this, SLOT(countSend(quint32))); + connect(&m_tcp, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); + connect(&m_tcp, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); connect(&m_udp, SIGNAL(connOpen(const QString&)), this, SLOT(listerAdd(const QString&))); connect(&m_udp, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(&m_udp, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); connect(&m_udp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); - connect(&m_udp, SIGNAL(countRecv(quint32)), this, SLOT(countRecv(quint32))); - connect(&m_udp, SIGNAL(countSend(quint32)), this, SLOT(countSend(quint32))); + connect(&m_udp, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); + connect(&m_udp, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); return true; } diff --git a/src/sokit/serverskt.cpp b/src/sokit/serverskt.cpp index ade288b..78e0e36 100644 --- a/src/sokit/serverskt.cpp +++ b/src/sokit/serverskt.cpp @@ -78,12 +78,12 @@ void ServerSkt::setError(const QString& err) void ServerSkt::recordRecv(qint32 bytes) { - emit countRecv((quint32)bytes); + emit countRecv(bytes); } void ServerSkt::recordSend(qint32 bytes) { - emit countSend((quint32)bytes); + emit countSend(bytes); } void ServerSkt::getKeys(QStringList& res) @@ -146,7 +146,7 @@ void ServerSkt::send(const QString& key, const QString& data) void ServerSkt::dump(const char* buf, qint32 len, bool isSend, const QString& key) { - emit dumpbin(QString("DAT %1 %2").arg(isSend?"<<<<":">>>>",key), buf, (quint32)len); + emit dumpbin(QString("DAT %1 %2").arg(isSend?"<---":"--->",key), buf, (quint32)len); } void ServerSkt::show(const QString& msg) diff --git a/src/sokit/serverskt.h b/src/sokit/serverskt.h index 55c7bff..9b5f81d 100644 --- a/src/sokit/serverskt.h +++ b/src/sokit/serverskt.h @@ -34,8 +34,8 @@ class ServerSkt : public QObject void message(const QString& msg); void dumpbin(const QString& title, const char* data, quint32 len); - void countRecv(quint32 bytes); - void countSend(quint32 bytes); + void countRecv(qint32 bytes); + void countSend(qint32 bytes); protected: void dump(const char* buf, qint32 len, bool isSend, const QString& key); diff --git a/src/sokit/transferform.cpp b/src/sokit/transferform.cpp index c726932..d8fe542 100644 --- a/src/sokit/transferform.cpp +++ b/src/sokit/transferform.cpp @@ -136,8 +136,8 @@ void TransferForm::trigger(bool start) connect(m_server, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(m_server, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); connect(m_server, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); - connect(m_server, SIGNAL(countRecv(quint32)), this, SLOT(countRecv(quint32))); - connect(m_server, SIGNAL(countSend(quint32)), this, SLOT(countSend(quint32))); + connect(m_server, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); + connect(m_server, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); connect(m_server, SIGNAL(stopped()), this, SLOT(stop())); start = m_server->start(sa.ip, sa.port, da.ip, da.port); diff --git a/src/sokit/transferskt.cpp b/src/sokit/transferskt.cpp index 1091f18..e3a01cd 100644 --- a/src/sokit/transferskt.cpp +++ b/src/sokit/transferskt.cpp @@ -75,12 +75,12 @@ void TransferSkt::setError(const QString& err) void TransferSkt::recordRecv(qint32 bytes) { - emit countRecv((quint32)bytes); + emit countRecv(bytes); } void TransferSkt::recordSend(qint32 bytes) { - emit countSend((quint32)bytes); + emit countSend(bytes); } void TransferSkt::getKeys(QStringList& res) @@ -146,10 +146,10 @@ void TransferSkt::dump(const char* buf, qint32 len, TransferSkt::DIR dir, const QString title("TRN"); switch (dir) { - case TS2D: title += " >>>> "; break; - case TD2S: title += " <<<< "; break; - case SS2D: title += " ++>> "; break; - case SD2S: title += " <<++ "; break; + case TS2D: title += " -->> "; break; + case TD2S: title += " <<-- "; break; + case SS2D: title += " --+> "; break; + case SD2S: title += " <+-- "; break; default: title += " ???? "; break; } title += key; diff --git a/src/sokit/transferskt.h b/src/sokit/transferskt.h index bab2aee..901e7fe 100644 --- a/src/sokit/transferskt.h +++ b/src/sokit/transferskt.h @@ -39,8 +39,8 @@ class TransferSkt : public QObject void dumpbin(const QString& title, const char* data, quint32 len); void stopped(); - void countRecv(quint32 bytes); - void countSend(quint32 bytes); + void countRecv(qint32 bytes); + void countSend(qint32 bytes); protected: enum DIR { TS2D, TD2S, SS2D, SD2S, };