2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made protected member variable private. Added accessor funcs.
	* src/AbstractBtMessage.cc
	* src/AbstractBtMessage.h
	* src/BtAllowedFastMessage.cc
	* src/BtAllowedFastMessage.h
	* src/BtBitfieldMessage.cc
	* src/BtBitfieldMessage.h
	* src/BtCancelMessage.cc
	* src/BtCancelMessage.h
	* src/BtChokeMessage.cc
	* src/BtChokeMessage.h
	* src/BtExtendedMessage.cc
	* src/BtHaveAllMessage.cc
	* src/BtHaveAllMessage.h
	* src/BtHaveMessage.cc
	* src/BtHaveMessage.h
	* src/BtHaveNoneMessage.cc
	* src/BtHaveNoneMessage.h
	* src/BtInterestedMessage.cc
	* src/BtInterestedMessage.h
	* src/BtNotInterestedMessage.cc
	* src/BtNotInterestedMessage.h
	* src/BtPieceMessage.cc
	* src/BtPieceMessage.h
	* src/BtPortMessage.cc
	* src/BtPortMessage.h
	* src/BtRejectMessage.cc
	* src/BtRejectMessage.h
	* src/BtRequestMessage.cc
	* src/BtRequestMessage.h
	* src/BtUnchokeMessage.cc
	* src/BtUnchokeMessage.h
	* src/SimpleBtMessage.cc
	* src/SimpleBtMessage.h

1 files changed, 16 insertions, 16 deletions

diff --git a/src/SimpleBtMessage.cc b/src/SimpleBtMessage.cc
index bd155552..8466d9ec 100644
--- a/src/SimpleBtMessage.cc
+++ b/src/SimpleBtMessage.cc
@@ -44,32 +44,32 @@ namespace aria2 {
 SimpleBtMessage::SimpleBtMessage(uint8_t id, const std::string& name):
   AbstractBtMessage(id, name) {}
 
-SimpleBtMessage::~SimpleBtMessage() {}
-
 void SimpleBtMessage::send() {
-  if(invalidate) {
+  if(isInvalidate()) {
     return;
   }
-  if(!sendPredicate() && !sendingInProgress) {
+  if(!sendPredicate() && !isSendingInProgress()) {
     return;
   }
-  if(!sendingInProgress) {
-    if(logger->info()) {
-      logger->info(MSG_SEND_PEER_MESSAGE,
-                   util::itos(cuid).c_str(),
-                   peer->ipaddr.c_str(), peer->port, toString().c_str());
+  if(!isSendingInProgress()) {
+    if(getLogger()->info()) {
+      getLogger()->info(MSG_SEND_PEER_MESSAGE,
+                        util::itos(getCuid()).c_str(),
+                        getPeer()->ipaddr.c_str(),
+                        getPeer()->port,
+                        toString().c_str());
     }
     unsigned char* msg = createMessage();
     size_t msgLength = getMessageLength();
-    if(logger->debug()) {
-      logger->debug("msglength = %lu bytes",
-                    static_cast<unsigned long>(msgLength));
+    if(getLogger()->debug()) {
+      getLogger()->debug("msglength = %lu bytes",
+                         static_cast<unsigned long>(msgLength));
     }
-    peerConnection->pushBytes(msg, msgLength);
+    getPeerConnection()->pushBytes(msg, msgLength);
   }
-  peerConnection->sendPendingData();
-  sendingInProgress = !peerConnection->sendBufferIsEmpty();
-  if(!sendingInProgress) {
+  getPeerConnection()->sendPendingData();
+  setSendingInProgress(!getPeerConnection()->sendBufferIsEmpty());
+  if(!isSendingInProgress()) {
     onSendComplete();
   }
 }