From 589bdf5dcd622d6b15094ecf2554bb31d07757b3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 21 Jun 2021 15:38:58 +0200 Subject: [PATCH] Use default --- ext/libstrawberry-common/core/logging.cpp | 4 ++-- ext/libstrawberry-tagreader/tagreader.cpp | 2 +- src/analyzer/fht.cpp | 2 +- src/core/settingsprovider.cpp | 4 ++-- src/core/song.cpp | 4 ++-- src/covermanager/albumcoverchoicecontroller.cpp | 2 +- src/device/gpodloader.cpp | 2 +- src/device/mtploader.cpp | 2 +- src/device/udisks2lister.cpp | 2 +- src/engine/enginebase.cpp | 2 +- src/playlist/playlistfilter.cpp | 3 +-- src/playlist/playlistfilterparser.cpp | 2 +- src/playlist/playlistitem.cpp | 2 +- src/qobuz/qobuzbaserequest.cpp | 2 +- src/scrobbler/lastfmscrobbler.cpp | 2 +- src/scrobbler/librefmscrobbler.cpp | 2 +- src/smartplaylists/smartplaylistquerywizardplugin.cpp | 2 +- src/smartplaylists/smartplaylistsview.cpp | 2 +- tests/src/mock_networkaccessmanager.cpp | 2 +- 19 files changed, 22 insertions(+), 23 deletions(-) diff --git a/ext/libstrawberry-common/core/logging.cpp b/ext/libstrawberry-common/core/logging.cpp index c23790df..9c19dfd3 100644 --- a/ext/libstrawberry-common/core/logging.cpp +++ b/ext/libstrawberry-common/core/logging.cpp @@ -99,7 +99,7 @@ class DebugBase : public QDebug { // Debug message will be stored in a buffer. class BufferedDebug : public DebugBase { public: - BufferedDebug() {} + BufferedDebug() = default; explicit BufferedDebug(QtMsgType) : buf_(new QBuffer, later_deleter) { buf_->open(QIODevice::WriteOnly); @@ -118,7 +118,7 @@ class BufferedDebug : public DebugBase { // Debug message will be logged immediately. class LoggedDebug : public DebugBase { public: - LoggedDebug() {} + LoggedDebug() = default; explicit LoggedDebug(QtMsgType t) : DebugBase(t) { nospace() << kMessageHandlerMagic; } }; diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp index 42fc5eb4..32e62d44 100644 --- a/ext/libstrawberry-tagreader/tagreader.cpp +++ b/ext/libstrawberry-tagreader/tagreader.cpp @@ -91,7 +91,7 @@ class FileRefFactory { public: FileRefFactory() = default; - virtual ~FileRefFactory() {} + virtual ~FileRefFactory() = default; virtual TagLib::FileRef *GetFileRef(const QString &filename) = 0; private: diff --git a/src/analyzer/fht.cpp b/src/analyzer/fht.cpp index d8a72cea..59a62a0c 100644 --- a/src/analyzer/fht.cpp +++ b/src/analyzer/fht.cpp @@ -35,7 +35,7 @@ FHT::FHT(int n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : n) { } } -FHT::~FHT() {} +FHT::~FHT() = default; int FHT::sizeExp() const { return exp2_; } int FHT::size() const { return num_; } diff --git a/src/core/settingsprovider.cpp b/src/core/settingsprovider.cpp index 76464b45..7c6e887b 100644 --- a/src/core/settingsprovider.cpp +++ b/src/core/settingsprovider.cpp @@ -23,9 +23,9 @@ #include "settingsprovider.h" -SettingsProvider::SettingsProvider() {} +SettingsProvider::SettingsProvider() = default; -DefaultSettingsProvider::DefaultSettingsProvider() {} +DefaultSettingsProvider::DefaultSettingsProvider() = default; void DefaultSettingsProvider::set_group(const char *group) { while (!backend_.group().isEmpty()) backend_.endGroup(); diff --git a/src/core/song.cpp b/src/core/song.cpp index 3ca39a94..58de9f57 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -275,8 +275,8 @@ Song::Private::Private(Song::Source source) {} Song::Song(Song::Source source) : d(new Private(source)) {} -Song::Song(const Song &other) : d(other.d) {} -Song::~Song() {} +Song::Song(const Song &other) = default; +Song::~Song() = default; Song &Song::operator=(const Song &other) { d = other.d; diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index baf6a0e1..8c6f7663 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -126,7 +126,7 @@ AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent) : } -AlbumCoverChoiceController::~AlbumCoverChoiceController() {} +AlbumCoverChoiceController::~AlbumCoverChoiceController() = default; void AlbumCoverChoiceController::Init(Application *app) { diff --git a/src/device/gpodloader.cpp b/src/device/gpodloader.cpp index 0d256ef9..6ae15528 100644 --- a/src/device/gpodloader.cpp +++ b/src/device/gpodloader.cpp @@ -47,7 +47,7 @@ GPodLoader::GPodLoader(const QString &mount_point, TaskManager *task_manager, Co original_thread_ = thread(); } -GPodLoader::~GPodLoader() {} +GPodLoader::~GPodLoader() = default; void GPodLoader::LoadDatabase() { diff --git a/src/device/mtploader.cpp b/src/device/mtploader.cpp index 3b1e2b19..450e2767 100644 --- a/src/device/mtploader.cpp +++ b/src/device/mtploader.cpp @@ -41,7 +41,7 @@ MtpLoader::MtpLoader(const QUrl &url, TaskManager *task_manager, CollectionBacke original_thread_ = thread(); } -MtpLoader::~MtpLoader() {} +MtpLoader::~MtpLoader() = default; bool MtpLoader::Init() { return true; } diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp index 080503cf..d235c993 100644 --- a/src/device/udisks2lister.cpp +++ b/src/device/udisks2lister.cpp @@ -54,7 +54,7 @@ constexpr char Udisks2Lister::udisks2_service_[]; Udisks2Lister::Udisks2Lister(QObject *parent) : DeviceLister(parent) {} -Udisks2Lister::~Udisks2Lister() {} +Udisks2Lister::~Udisks2Lister() = default; QStringList Udisks2Lister::DeviceUniqueIDs() { QReadLocker locker(&device_data_lock_); diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp index 080a67c8..f530a53b 100644 --- a/src/engine/enginebase.cpp +++ b/src/engine/enginebase.cpp @@ -69,7 +69,7 @@ Engine::Base::Base(const EngineType type, QObject *parent) channels_(0), about_to_end_emitted_(false) {} -Engine::Base::~Base() {} +Engine::Base::~Base() = default; bool Engine::Base::Load(const QUrl &stream_url, const QUrl &original_url, const TrackChangeFlags, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec) { diff --git a/src/playlist/playlistfilter.cpp b/src/playlist/playlistfilter.cpp index 58eb5f6f..b2aa0268 100644 --- a/src/playlist/playlistfilter.cpp +++ b/src/playlist/playlistfilter.cpp @@ -69,8 +69,7 @@ PlaylistFilter::PlaylistFilter(QObject *parent) << Playlist::Column_Bitrate; } -PlaylistFilter::~PlaylistFilter() { -} +PlaylistFilter::~PlaylistFilter() = default; void PlaylistFilter::sort(int column, Qt::SortOrder order) { // Pass this through to the Playlist, it does sorting itself diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp index 4d65f09b..41fbe571 100644 --- a/src/playlist/playlistfilterparser.cpp +++ b/src/playlist/playlistfilterparser.cpp @@ -36,7 +36,7 @@ class SearchTermComparator { public: SearchTermComparator() = default; - virtual ~SearchTermComparator() {} + virtual ~SearchTermComparator() = default; virtual bool Matches(const QString &element) const = 0; private: Q_DISABLE_COPY(SearchTermComparator) diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp index c9834f46..706619d8 100644 --- a/src/playlist/playlistitem.cpp +++ b/src/playlist/playlistitem.cpp @@ -80,7 +80,7 @@ PlaylistItem *PlaylistItem::NewFromSong(const Song &song) { } -PlaylistItem::~PlaylistItem() {} +PlaylistItem::~PlaylistItem() = default; void PlaylistItem::BindToQuery(QSqlQuery *query) const { diff --git a/src/qobuz/qobuzbaserequest.cpp b/src/qobuz/qobuzbaserequest.cpp index 5842fe3f..57864c8b 100644 --- a/src/qobuz/qobuzbaserequest.cpp +++ b/src/qobuz/qobuzbaserequest.cpp @@ -49,7 +49,7 @@ QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, NetworkAccessManager * network_(network) {} -QobuzBaseRequest::~QobuzBaseRequest() {} +QobuzBaseRequest::~QobuzBaseRequest() = default; QNetworkReply *QobuzBaseRequest::CreateRequest(const QString &ressource_name, const QList ¶ms_provided) { diff --git a/src/scrobbler/lastfmscrobbler.cpp b/src/scrobbler/lastfmscrobbler.cpp index 6af9c0a2..607eeab5 100644 --- a/src/scrobbler/lastfmscrobbler.cpp +++ b/src/scrobbler/lastfmscrobbler.cpp @@ -50,4 +50,4 @@ LastFMScrobbler::LastFMScrobbler(Application *app, QObject *parent) : Scrobbling } -LastFMScrobbler::~LastFMScrobbler() {} +LastFMScrobbler::~LastFMScrobbler() = default; diff --git a/src/scrobbler/librefmscrobbler.cpp b/src/scrobbler/librefmscrobbler.cpp index 3a5aed79..74f55ecb 100644 --- a/src/scrobbler/librefmscrobbler.cpp +++ b/src/scrobbler/librefmscrobbler.cpp @@ -50,4 +50,4 @@ LibreFMScrobbler::LibreFMScrobbler(Application *app, QObject *parent) : Scrobbli } -LibreFMScrobbler::~LibreFMScrobbler() {} +LibreFMScrobbler::~LibreFMScrobbler() = default; diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.cpp b/src/smartplaylists/smartplaylistquerywizardplugin.cpp index 3c2cd91d..00fe915e 100644 --- a/src/smartplaylists/smartplaylistquerywizardplugin.cpp +++ b/src/smartplaylists/smartplaylistquerywizardplugin.cpp @@ -86,7 +86,7 @@ SmartPlaylistQueryWizardPlugin::SmartPlaylistQueryWizardPlugin(Application *app, search_page_(nullptr), previous_scrollarea_max_(0) {} -SmartPlaylistQueryWizardPlugin::~SmartPlaylistQueryWizardPlugin() {} +SmartPlaylistQueryWizardPlugin::~SmartPlaylistQueryWizardPlugin() = default; QString SmartPlaylistQueryWizardPlugin::name() const { return tr("Collection search"); } diff --git a/src/smartplaylists/smartplaylistsview.cpp b/src/smartplaylists/smartplaylistsview.cpp index 4e40f46c..64cd41a3 100644 --- a/src/smartplaylists/smartplaylistsview.cpp +++ b/src/smartplaylists/smartplaylistsview.cpp @@ -39,7 +39,7 @@ SmartPlaylistsView::SmartPlaylistsView(QWidget *_parent) : QListView(_parent) { } -SmartPlaylistsView::~SmartPlaylistsView() {} +SmartPlaylistsView::~SmartPlaylistsView() = default; void SmartPlaylistsView::selectionChanged(const QItemSelection&, const QItemSelection&) { emit ItemsSelectedChanged(); diff --git a/tests/src/mock_networkaccessmanager.cpp b/tests/src/mock_networkaccessmanager.cpp index fb2bb773..09786a93 100644 --- a/tests/src/mock_networkaccessmanager.cpp +++ b/tests/src/mock_networkaccessmanager.cpp @@ -44,7 +44,7 @@ class RequestForUrlMatcher : public MatcherInterface { RequestForUrlMatcher(const QString& contains, const QMap &expected_params) : contains_(contains), expected_params_(expected_params) {} - ~RequestForUrlMatcher() override {} + ~RequestForUrlMatcher() override = default; virtual bool Matches(const QNetworkRequest& req) const { const QUrl& url = req.url();