Use default where possible

forthdim · Aug 29, 2016 · 366e2e8 · 366e2e8
1 parent 08f4b5e
commit 366e2e8
Show file tree

Hide file tree

Showing 272 changed files with 346 additions and 368 deletions.
diff --git a/src/AbstractAuthResolver.cc b/src/AbstractAuthResolver.cc
@@ -40,7 +40,7 @@ namespace aria2 {
 
 AbstractAuthResolver::AbstractAuthResolver() {}
 
-AbstractAuthResolver::~AbstractAuthResolver() {}
+AbstractAuthResolver::~AbstractAuthResolver() = default;
 
 void AbstractAuthResolver::setUserDefinedCred(std::string user,
                                               std::string password)

diff --git a/src/AbstractBtMessage.cc b/src/AbstractBtMessage.cc
@@ -54,7 +54,7 @@ AbstractBtMessage::AbstractBtMessage(uint8_t id, const char* name)
 {
 }
 
-AbstractBtMessage::~AbstractBtMessage() {}
+AbstractBtMessage::~AbstractBtMessage() = default;
 
 void AbstractBtMessage::setPeer(const std::shared_ptr<Peer>& peer)
 {

diff --git a/src/AbstractOptionHandler.cc b/src/AbstractOptionHandler.cc
@@ -58,7 +58,7 @@ AbstractOptionHandler::AbstractOptionHandler(PrefPtr pref,
 {
 }
 
-AbstractOptionHandler::~AbstractOptionHandler() {}
+AbstractOptionHandler::~AbstractOptionHandler() = default;
 
 void AbstractOptionHandler::parse(Option& option, const std::string& arg) const
 {

diff --git a/src/AbstractProxyRequestCommand.cc b/src/AbstractProxyRequestCommand.cc
@@ -64,7 +64,7 @@ AbstractProxyRequestCommand::AbstractProxyRequestCommand(
   setWriteCheckSocket(getSocket());
 }
 
-AbstractProxyRequestCommand::~AbstractProxyRequestCommand() {}
+AbstractProxyRequestCommand::~AbstractProxyRequestCommand() = default;
 
 bool AbstractProxyRequestCommand::executeInternal()
 {

diff --git a/src/AbstractProxyResponseCommand.cc b/src/AbstractProxyResponseCommand.cc
@@ -60,7 +60,7 @@ AbstractProxyResponseCommand::AbstractProxyResponseCommand(
 {
 }
 
-AbstractProxyResponseCommand::~AbstractProxyResponseCommand() {}
+AbstractProxyResponseCommand::~AbstractProxyResponseCommand() = default;
 
 bool AbstractProxyResponseCommand::executeInternal()
 {

diff --git a/src/AbstractSingleDiskAdaptor.cc b/src/AbstractSingleDiskAdaptor.cc
@@ -51,7 +51,7 @@ AbstractSingleDiskAdaptor::AbstractSingleDiskAdaptor()
 {
 }
 
-AbstractSingleDiskAdaptor::~AbstractSingleDiskAdaptor() {}
+AbstractSingleDiskAdaptor::~AbstractSingleDiskAdaptor() = default;
 
 void AbstractSingleDiskAdaptor::initAndOpenFile()
 {

diff --git a/src/AdaptiveFileAllocationIterator.cc b/src/AdaptiveFileAllocationIterator.cc
@@ -51,7 +51,7 @@ AdaptiveFileAllocationIterator::AdaptiveFileAllocationIterator(
 {
 }
 
-AdaptiveFileAllocationIterator::~AdaptiveFileAllocationIterator() {}
+AdaptiveFileAllocationIterator::~AdaptiveFileAllocationIterator() = default;
 
 void AdaptiveFileAllocationIterator::allocateChunk()
 {

diff --git a/src/AdaptiveURISelector.cc b/src/AdaptiveURISelector.cc
@@ -72,7 +72,7 @@ AdaptiveURISelector::AdaptiveURISelector(
   resetCounters();
 }
 
-AdaptiveURISelector::~AdaptiveURISelector() {}
+AdaptiveURISelector::~AdaptiveURISelector() = default;
 
 std::string AdaptiveURISelector::select(
     FileEntry* fileEntry,

diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc
@@ -58,7 +58,7 @@ AnnounceList::AnnounceList(
   resetIterator();
 }
 
-AnnounceList::~AnnounceList() {}
+AnnounceList::~AnnounceList() = default;
 
 void AnnounceList::reconfigure(
     const std::vector<std::vector<std::string>>& announceList)

diff --git a/src/AnnounceTier.cc b/src/AnnounceTier.cc
@@ -41,7 +41,7 @@ AnnounceTier::AnnounceTier(std::deque<std::string> urls)
 {
 }
 
-AnnounceTier::~AnnounceTier() {}
+AnnounceTier::~AnnounceTier() = default;
 
 void AnnounceTier::nextEvent()
 {

diff --git a/src/AnonDiskWriterFactory.h b/src/AnonDiskWriterFactory.h
@@ -45,8 +45,8 @@ namespace aria2 {
 template <class DiskWriterType>
 class AnonDiskWriterFactory : public DiskWriterFactory {
 public:
-  AnonDiskWriterFactory() {}
-  virtual ~AnonDiskWriterFactory() {}
+  AnonDiskWriterFactory() = default;
+  virtual ~AnonDiskWriterFactory() = default;
 
   virtual std::unique_ptr<DiskWriter>
   newDiskWriter(const std::string& filename) CXX11_OVERRIDE

diff --git a/src/ApiCallbackDownloadEventListener.cc b/src/ApiCallbackDownloadEventListener.cc
@@ -43,7 +43,7 @@ ApiCallbackDownloadEventListener::ApiCallbackDownloadEventListener(
 {
 }
 
-ApiCallbackDownloadEventListener::~ApiCallbackDownloadEventListener() {}
+ApiCallbackDownloadEventListener::~ApiCallbackDownloadEventListener() = default;
 
 void ApiCallbackDownloadEventListener::onEvent(DownloadEvent event,
                                                const RequestGroup* group)

diff --git a/src/AppleMessageDigestImpl.cc b/src/AppleMessageDigestImpl.cc
@@ -48,7 +48,7 @@ template <size_t dlen, typename ctx_t, int (*init_fn)(ctx_t*),
 class MessageDigestBase : public MessageDigestImpl {
 public:
   MessageDigestBase() { reset(); }
-  virtual ~MessageDigestBase() {}
+  virtual ~MessageDigestBase() = default;
 
   static size_t length() { return dlen; }
   virtual size_t getDigestLength() const CXX11_OVERRIDE { return dlen; }

diff --git a/src/AuthConfig.cc b/src/AuthConfig.cc
@@ -47,7 +47,7 @@ AuthConfig::AuthConfig(std::string user, std::string password)
 {
 }
 
-AuthConfig::~AuthConfig() {}
+AuthConfig::~AuthConfig() = default;
 
 std::string AuthConfig::getAuthText() const
 {

diff --git a/src/AuthConfigFactory.cc b/src/AuthConfigFactory.cc
@@ -54,7 +54,7 @@ const std::string AUTH_DEFAULT_PASSWD("ARIA2USER@");
 
 AuthConfigFactory::AuthConfigFactory() {}
 
-AuthConfigFactory::~AuthConfigFactory() {}
+AuthConfigFactory::~AuthConfigFactory() = default;
 
 std::unique_ptr<AuthConfig>
 AuthConfigFactory::createAuthConfig(const std::shared_ptr<Request>& request,

diff --git a/src/AuthResolver.h b/src/AuthResolver.h
@@ -46,7 +46,7 @@ class AuthConfig;
 
 class AuthResolver {
 public:
-  virtual ~AuthResolver() {}
+  virtual ~AuthResolver() = default;
 
   virtual std::unique_ptr<AuthConfig>
   resolveAuthConfig(const std::string& hostname) = 0;

diff --git a/src/AutoSaveCommand.cc b/src/AutoSaveCommand.cc
@@ -44,7 +44,7 @@ AutoSaveCommand::AutoSaveCommand(cuid_t cuid, DownloadEngine* e,
 {
 }
 
-AutoSaveCommand::~AutoSaveCommand() {}
+AutoSaveCommand::~AutoSaveCommand() = default;
 
 void AutoSaveCommand::preProcess()
 {

diff --git a/src/BencodeParser.cc b/src/BencodeParser.cc
@@ -72,7 +72,7 @@ BencodeParser::BencodeParser(StructParserStateMachine* psm)
   stateStack_.push(BENCODE_FINISH);
 }
 
-BencodeParser::~BencodeParser() {}
+BencodeParser::~BencodeParser() = default;
 
 ssize_t BencodeParser::parseUpdate(const char* data, size_t size)
 {

diff --git a/src/BinaryStream.h b/src/BinaryStream.h
@@ -43,7 +43,7 @@ namespace aria2 {
 
 class BinaryStream {
 public:
-  virtual ~BinaryStream() {}
+  virtual ~BinaryStream() = default;
 
   virtual void writeData(const unsigned char* data, size_t len,
                          int64_t offset) = 0;

diff --git a/src/BtAbortOutstandingRequestEvent.cc b/src/BtAbortOutstandingRequestEvent.cc
@@ -43,6 +43,6 @@ BtAbortOutstandingRequestEvent::BtAbortOutstandingRequestEvent(
 {
 }
 
-BtAbortOutstandingRequestEvent::~BtAbortOutstandingRequestEvent() {}
+BtAbortOutstandingRequestEvent::~BtAbortOutstandingRequestEvent() = default;
 
 } // namespace aria2
diff --git a/src/BtAnnounce.h b/src/BtAnnounce.h
@@ -49,7 +49,7 @@ struct UDPTrackerRequest;
 
 class BtAnnounce {
 public:
-  virtual ~BtAnnounce() {}
+  virtual ~BtAnnounce() = default;
 
   /**
    * Returns true if announce is required.

diff --git a/src/BtBitfieldMessage.cc b/src/BtBitfieldMessage.cc
@@ -56,7 +56,7 @@ BtBitfieldMessage::BtBitfieldMessage(const unsigned char* bitfield,
 {
 }
 
-BtBitfieldMessage::~BtBitfieldMessage() {}
+BtBitfieldMessage::~BtBitfieldMessage() = default;
 
 void BtBitfieldMessage::setBitfield(const unsigned char* bitfield,
                                     size_t bitfieldLength)

diff --git a/src/BtBitfieldMessageValidator.cc b/src/BtBitfieldMessageValidator.cc
@@ -44,7 +44,7 @@ BtBitfieldMessageValidator::BtBitfieldMessageValidator(
 {
 }
 
-BtBitfieldMessageValidator::~BtBitfieldMessageValidator() {}
+BtBitfieldMessageValidator::~BtBitfieldMessageValidator() = default;
 
 void BtBitfieldMessageValidator::validate()
 {

diff --git a/src/BtCheckIntegrityEntry.cc b/src/BtCheckIntegrityEntry.cc
@@ -51,7 +51,7 @@ BtCheckIntegrityEntry::BtCheckIntegrityEntry(RequestGroup* requestGroup)
 {
 }
 
-BtCheckIntegrityEntry::~BtCheckIntegrityEntry() {}
+BtCheckIntegrityEntry::~BtCheckIntegrityEntry() = default;
 
 void BtCheckIntegrityEntry::onDownloadIncomplete(
     std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e)

diff --git a/src/BtDependency.cc b/src/BtDependency.cc
@@ -59,7 +59,7 @@ BtDependency::BtDependency(RequestGroup* dependant,
 {
 }
 
-BtDependency::~BtDependency() {}
+BtDependency::~BtDependency() = default;
 
 namespace {
 void copyValues(const std::shared_ptr<FileEntry>& d,

diff --git a/src/BtFileAllocationEntry.cc b/src/BtFileAllocationEntry.cc
@@ -55,7 +55,7 @@ BtFileAllocationEntry::BtFileAllocationEntry(RequestGroup* requestGroup)
 {
 }
 
-BtFileAllocationEntry::~BtFileAllocationEntry() {}
+BtFileAllocationEntry::~BtFileAllocationEntry() = default;
 
 void BtFileAllocationEntry::prepareForNextAction(
     std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e)

diff --git a/src/BtHandshakeMessage.cc b/src/BtHandshakeMessage.cc
@@ -55,7 +55,7 @@ BtHandshakeMessage::BtHandshakeMessage(const unsigned char* infoHash,
   std::copy_n(peerId, peerId_.size(), std::begin(peerId_));
 }
 
-BtHandshakeMessage::~BtHandshakeMessage() {}
+BtHandshakeMessage::~BtHandshakeMessage() = default;
 
 void BtHandshakeMessage::init()
 {

diff --git a/src/BtHandshakeMessageValidator.cc b/src/BtHandshakeMessageValidator.cc
@@ -50,7 +50,7 @@ BtHandshakeMessageValidator::BtHandshakeMessageValidator(
   memcpy(infoHash_, infoHash, sizeof(infoHash_));
 }
 
-BtHandshakeMessageValidator::~BtHandshakeMessageValidator() {}
+BtHandshakeMessageValidator::~BtHandshakeMessageValidator() = default;
 
 void BtHandshakeMessageValidator::validate()
 {

diff --git a/src/BtInteractive.h b/src/BtInteractive.h
@@ -45,7 +45,7 @@ class BtHandshakeMessage;
 
 class BtInteractive {
 public:
-  virtual ~BtInteractive() {}
+  virtual ~BtInteractive() = default;
 
   virtual void initiateHandshake() = 0;
 

diff --git a/src/BtInterestedMessage.cc b/src/BtInterestedMessage.cc
@@ -46,7 +46,7 @@ BtInterestedMessage::BtInterestedMessage()
 {
 }
 
-BtInterestedMessage::~BtInterestedMessage() {}
+BtInterestedMessage::~BtInterestedMessage() = default;
 
 std::unique_ptr<BtInterestedMessage>
 BtInterestedMessage::create(const unsigned char* data, size_t dataLength)

diff --git a/src/BtLeecherStateChoke.cc b/src/BtLeecherStateChoke.cc
@@ -50,7 +50,7 @@ BtLeecherStateChoke::BtLeecherStateChoke()
 {
 }
 
-BtLeecherStateChoke::~BtLeecherStateChoke() {}
+BtLeecherStateChoke::~BtLeecherStateChoke() = default;
 
 BtLeecherStateChoke::PeerEntry::PeerEntry(const std::shared_ptr<Peer>& peer)
     : peer_(peer),
@@ -63,11 +63,7 @@ BtLeecherStateChoke::PeerEntry::PeerEntry(const std::shared_ptr<Peer>& peer)
 }
 
 BtLeecherStateChoke::PeerEntry::PeerEntry(const PeerEntry& c)
-    : peer_(c.peer_),
-      downloadSpeed_(c.downloadSpeed_),
-      regularUnchoker_(c.regularUnchoker_)
-{
-}
+    = default;
 
 void BtLeecherStateChoke::PeerEntry::swap(PeerEntry& c)
 {
@@ -88,7 +84,7 @@ operator=(const PeerEntry& c)
   return *this;
 }
 
-BtLeecherStateChoke::PeerEntry::~PeerEntry() {}
+BtLeecherStateChoke::PeerEntry::~PeerEntry() = default;
 
 const std::shared_ptr<Peer>& BtLeecherStateChoke::PeerEntry::getPeer() const
 {

diff --git a/src/BtMessage.h b/src/BtMessage.h
@@ -54,7 +54,7 @@ class BtMessage {
 public:
   BtMessage(uint8_t id) : id_(id) {}
 
-  virtual ~BtMessage() {}
+  virtual ~BtMessage() = default;
 
   virtual bool isInvalidate() = 0;
 

diff --git a/src/BtMessageDispatcher.h b/src/BtMessageDispatcher.h
@@ -49,7 +49,7 @@ class BtMessage;
 
 class BtMessageDispatcher {
 public:
-  virtual ~BtMessageDispatcher() {}
+  virtual ~BtMessageDispatcher() = default;
 
   virtual void addMessageToQueue(std::unique_ptr<BtMessage> btMessage) = 0;
 

diff --git a/src/BtMessageFactory.h b/src/BtMessageFactory.h
@@ -64,7 +64,7 @@ class Piece;
 
 class BtMessageFactory {
 public:
-  virtual ~BtMessageFactory() {}
+  virtual ~BtMessageFactory() = default;
 
   virtual std::unique_ptr<BtMessage> createBtMessage(const unsigned char* msg,
                                                      size_t msgLength) = 0;

diff --git a/src/BtMessageReceiver.h b/src/BtMessageReceiver.h
@@ -46,7 +46,7 @@ class BtHandshakeMessage;
 
 class BtMessageReceiver {
 public:
-  virtual ~BtMessageReceiver() {}
+  virtual ~BtMessageReceiver() = default;
 
   virtual std::unique_ptr<BtHandshakeMessage>
   receiveHandshake(bool quickReply = false) = 0;

diff --git a/src/BtMessageValidator.h b/src/BtMessageValidator.h
@@ -43,7 +43,7 @@ namespace aria2 {
 
 class BtMessageValidator {
 public:
-  virtual ~BtMessageValidator() {}
+  virtual ~BtMessageValidator() = default;
 
   // Throws RecoverableException on error.
   virtual void validate() = 0;

diff --git a/src/BtNotInterestedMessage.cc b/src/BtNotInterestedMessage.cc
@@ -46,7 +46,7 @@ BtNotInterestedMessage::BtNotInterestedMessage()
 {
 }
 
-BtNotInterestedMessage::~BtNotInterestedMessage() {}
+BtNotInterestedMessage::~BtNotInterestedMessage() = default;
 
 std::unique_ptr<BtNotInterestedMessage>
 BtNotInterestedMessage::create(const unsigned char* data, size_t dataLength)

diff --git a/src/BtPieceMessage.cc b/src/BtPieceMessage.cc
@@ -78,7 +78,7 @@ BtPieceMessage::BtPieceMessage(size_t index, int32_t begin, int32_t blockLength)
   setUploading(true);
 }
 
-BtPieceMessage::~BtPieceMessage() {}
+BtPieceMessage::~BtPieceMessage() = default;
 
 void BtPieceMessage::setMsgPayload(const unsigned char* data) { data_ = data; }
 

diff --git a/src/BtPieceMessageValidator.cc b/src/BtPieceMessageValidator.cc
@@ -45,7 +45,7 @@ BtPieceMessageValidator::BtPieceMessageValidator(const BtPieceMessage* message,
 {
 }
 
-BtPieceMessageValidator::~BtPieceMessageValidator() {}
+BtPieceMessageValidator::~BtPieceMessageValidator() = default;
 
 void BtPieceMessageValidator::validate()
 {

diff --git a/src/BtProgressInfoFile.h b/src/BtProgressInfoFile.h
@@ -43,7 +43,7 @@ namespace aria2 {
 
 class BtProgressInfoFile {
 public:
-  virtual ~BtProgressInfoFile() {}
+  virtual ~BtProgressInfoFile() = default;
 
   virtual std::string getFilename() = 0;
 

diff --git a/src/BtRequestFactory.h b/src/BtRequestFactory.h
@@ -47,7 +47,7 @@ class BtRequestMessage;
 
 class BtRequestFactory {
 public:
-  virtual ~BtRequestFactory() {}
+  virtual ~BtRequestFactory() = default;
 
   virtual void addTargetPiece(const std::shared_ptr<Piece>& piece) = 0;
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     }
-    AbstractBtMessage::~AbstractBtMessage() {}
+    AbstractBtMessage::~AbstractBtMessage() = default;
     void AbstractBtMessage::setPeer(const std::shared_ptr<Peer>& peer)
     {
@@ Expand Down @@