make clang-format using clang-format-3.6

1 files changed, 25 insertions, 58 deletions

diff --git a/src/AbstractBtMessage.h b/src/AbstractBtMessage.h
index 5b46ce21..d03b6567 100644
--- a/src/AbstractBtMessage.h
+++ b/src/AbstractBtMessage.h
@@ -71,69 +71,38 @@ private:
   std::unique_ptr<BtMessageValidator> validator_;
 
   bool metadataGetMode_;
+
 protected:
-  PieceStorage* getPieceStorage() const
-  {
-    return pieceStorage_;
-  }
+  PieceStorage* getPieceStorage() const { return pieceStorage_; }
 
-  PeerConnection* getPeerConnection() const
-  {
-    return peerConnection_;
-  }
+  PeerConnection* getPeerConnection() const { return peerConnection_; }
 
-  BtMessageDispatcher* getBtMessageDispatcher() const
-  {
-    return dispatcher_;
-  }
+  BtMessageDispatcher* getBtMessageDispatcher() const { return dispatcher_; }
 
-  BtRequestFactory* getBtRequestFactory() const
-  {
-    return requestFactory_;
-  }
+  BtRequestFactory* getBtRequestFactory() const { return requestFactory_; }
 
-  BtMessageFactory* getBtMessageFactory() const
-  {
-    return messageFactory_;
-  }
+  BtMessageFactory* getBtMessageFactory() const { return messageFactory_; }
+
+  bool isMetadataGetMode() const { return metadataGetMode_; }
 
-  bool isMetadataGetMode() const
-  {
-    return metadataGetMode_;
-  }
 public:
   AbstractBtMessage(uint8_t id, const char* name);
 
   virtual ~AbstractBtMessage();
 
-  virtual bool isInvalidate() CXX11_OVERRIDE {
-    return invalidate_;
-  }
+  virtual bool isInvalidate() CXX11_OVERRIDE { return invalidate_; }
 
-  void setInvalidate(bool invalidate) {
-    invalidate_ = invalidate;
-  }
+  void setInvalidate(bool invalidate) { invalidate_ = invalidate; }
 
-  virtual bool isUploading() CXX11_OVERRIDE {
-    return uploading_;
-  }
+  virtual bool isUploading() CXX11_OVERRIDE { return uploading_; }
 
-  void setUploading(bool uploading) {
-    uploading_ = uploading;
-  }
+  void setUploading(bool uploading) { uploading_ = uploading; }
 
-  cuid_t getCuid() const {
-    return cuid_;
-  }
+  cuid_t getCuid() const { return cuid_; }
 
-  void setCuid(cuid_t cuid) {
-    cuid_ = cuid;
-  }
+  void setCuid(cuid_t cuid) { cuid_ = cuid; }
 
-  const std::shared_ptr<Peer>& getPeer() const
-  {
-    return peer_;
-  }
+  const std::shared_ptr<Peer>& getPeer() const { return peer_; }
 
   void setPeer(const std::shared_ptr<Peer>& peer);
 
@@ -143,11 +112,15 @@ public:
 
   virtual void onQueued() CXX11_OVERRIDE {}
 
-  virtual void onAbortOutstandingRequestEvent
-  (const BtAbortOutstandingRequestEvent& event) CXX11_OVERRIDE {}
+  virtual void onAbortOutstandingRequestEvent(
+      const BtAbortOutstandingRequestEvent& event) CXX11_OVERRIDE
+  {
+  }
 
-  virtual void onCancelSendingPieceEvent
-  (const BtCancelSendingPieceEvent& event) CXX11_OVERRIDE {}
+  virtual void onCancelSendingPieceEvent(const BtCancelSendingPieceEvent& event)
+      CXX11_OVERRIDE
+  {
+  }
 
   virtual void onChokingEvent(const BtChokingEvent& event) CXX11_OVERRIDE {}
 
@@ -163,15 +136,9 @@ public:
 
   void setBtRequestFactory(BtRequestFactory* factory);
 
-  const char* getName() const
-  {
-    return name_;
-  }
+  const char* getName() const { return name_; }
 
-  void enableMetadataGetMode()
-  {
-    metadataGetMode_ = true;
-  }
+  void enableMetadataGetMode() { metadataGetMode_ = true; }
 };
 
 } // namespace aria2