From b7fc365804d1aa8a16bdf28d4b308f54b06911bc Mon Sep 17 00:00:00 2001 From: Jekyll Wu Date: Sat, 21 Apr 2012 10:27:59 +0800 Subject: [PATCH] Just rename for consistency and readability --- src/Session.cpp | 10 +++++----- src/Session.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Session.cpp b/src/Session.cpp index bf1dd5b76..14829bbe0 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -1173,7 +1173,7 @@ void Session::startZModem(const QString& zmodem, const QString& dir, const QStri _zmodemProc->start(); disconnect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, SLOT(onReceiveBlock(const char*,int))); - connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, SLOT(zmodemRcvBlock(const char*,int))); + connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, SLOT(zmodemReceiveBlock(const char*,int))); _zmodemProgress = new ZModemDialog(QApplication::activeWindow(), false, i18n("ZModem Progress")); @@ -1217,11 +1217,11 @@ void Session::zmodemReadStatus() } } -void Session::zmodemRcvBlock(const char* data, int len) +void Session::zmodemReceiveBlock(const char* data, int len) { - QByteArray ba(data, len); + QByteArray bytes(data, len); - _zmodemProc->write(ba); + _zmodemProc->write(bytes); } void Session::zmodemFinished() @@ -1236,7 +1236,7 @@ void Session::zmodemFinished() _zmodemBusy = false; delete process; // Now, the KProcess may be disposed safely. - disconnect(_shellProcess, SIGNAL(receivedData(const char*,int)), this , SLOT(zmodemRcvBlock(const char*,int))); + disconnect(_shellProcess, SIGNAL(receivedData(const char*,int)), this , SLOT(zmodemReceiveBlock(const char*,int))); connect(_shellProcess, SIGNAL(receivedData(const char*,int)), this, SLOT(onReceiveBlock(const char*,int))); _shellProcess->sendData("\030\030\030\030", 4); // Abort diff --git a/src/Session.h b/src/Session.h index 23ea0e525..3d5736901 100644 --- a/src/Session.h +++ b/src/Session.h @@ -667,7 +667,7 @@ private slots: void zmodemReadStatus(); void zmodemReadAndSendBlock(); - void zmodemRcvBlock(const char* data, int len); + void zmodemReceiveBlock(const char* data, int len); void zmodemFinished(); void updateFlowControlState(bool suspended);