diff --git a/src/audiomanager.cpp b/src/audiomanager.cpp index 303e7508..01051c90 100644 --- a/src/audiomanager.cpp +++ b/src/audiomanager.cpp @@ -96,9 +96,7 @@ AudioManager::AudioManager(QObject *parent) } } -AudioManager::~AudioManager() -{ -} +AudioManager::~AudioManager() = default; QString AudioManager::backendName(KMediaSession::MediaBackends backend) const { diff --git a/src/author.cpp b/src/author.cpp index 459f9252..7db1da5e 100644 --- a/src/author.cpp +++ b/src/author.cpp @@ -14,10 +14,6 @@ Author::Author(const QString &name, const QString &email, const QString &url, QO { } -Author::~Author() -{ -} - QString Author::name() const { return m_name; diff --git a/src/author.h b/src/author.h index f7e7a2ab..c784f6f7 100644 --- a/src/author.h +++ b/src/author.h @@ -18,7 +18,6 @@ class Author : public QObject public: Author(const QString &name, const QString &email, const QString &url, QObject *parent = nullptr); - ~Author(); QString name() const; QString email() const; diff --git a/src/chapter.cpp b/src/chapter.cpp index b40f4545..aee553a8 100644 --- a/src/chapter.cpp +++ b/src/chapter.cpp @@ -24,10 +24,6 @@ Chapter::Chapter(Entry *entry, const QString &title, const QString &link, const }); } -Chapter::~Chapter() -{ -} - Entry *Chapter::entry() const { return m_entry; diff --git a/src/chapter.h b/src/chapter.h index 19e8c859..a5838e51 100644 --- a/src/chapter.h +++ b/src/chapter.h @@ -25,7 +25,6 @@ class Chapter : public QObject public: Chapter(Entry *entry, const QString &title, const QString &link, const QString &image, const int &start, QObject *parent = nullptr); - ~Chapter(); Entry *entry() const; QString title() const; diff --git a/src/entry.cpp b/src/entry.cpp index 0d2bf4d0..656ac9a6 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -42,10 +42,6 @@ Entry::Entry(Feed *feed, const QString &id) updateFromDb(false); } -Entry::~Entry() -{ -} - void Entry::updateFromDb(bool emitSignals) { QSqlQuery entryQuery; diff --git a/src/entry.h b/src/entry.h index 5378a560..c6bda40f 100644 --- a/src/entry.h +++ b/src/entry.h @@ -41,7 +41,6 @@ class Entry : public QObject public: Entry(Feed *feed, const QString &id); - ~Entry(); QString id() const; QString title() const; diff --git a/src/feed.cpp b/src/feed.cpp index d0145c9c..32bce402 100644 --- a/src/feed.cpp +++ b/src/feed.cpp @@ -98,10 +98,6 @@ Feed::Feed(const QString &feedurl) m_entries = new EntriesProxyModel(this); } -Feed::~Feed() -{ -} - void Feed::updateAuthors() { QVector newAuthors; diff --git a/src/feed.h b/src/feed.h index df535536..a7c1f21a 100644 --- a/src/feed.h +++ b/src/feed.h @@ -44,8 +44,6 @@ class Feed : public QObject public: Feed(const QString &feedurl); - ~Feed(); - void updateAuthors(); QString url() const; diff --git a/src/kmediasession/metadata.cpp b/src/kmediasession/metadata.cpp index 8dd1b139..b6661771 100644 --- a/src/kmediasession/metadata.cpp +++ b/src/kmediasession/metadata.cpp @@ -19,11 +19,6 @@ MetaData::MetaData(QObject *parent) connect(this, &MetaData::artworkUrlChanged, this, &MetaData::signalMetaDataChanged); } -MetaData::~MetaData() -{ - qCDebug(MetaDataLog) << "MetaData::~MetaData"; -} - QString MetaData::title() const { qCDebug(MetaDataLog) << "MetaData::title()"; diff --git a/src/kmediasession/metadata.h b/src/kmediasession/metadata.h index b5513530..24a902fe 100644 --- a/src/kmediasession/metadata.h +++ b/src/kmediasession/metadata.h @@ -23,7 +23,6 @@ class KMEDIASESSION_EXPORT MetaData : public QObject public: explicit MetaData(QObject *parent = nullptr); - ~MetaData(); QString title() const; QString artist() const; diff --git a/src/kmediasession/mpris2/mediaplayer2player.cpp b/src/kmediasession/mpris2/mediaplayer2player.cpp index 6a406ac9..765b5271 100644 --- a/src/kmediasession/mpris2/mediaplayer2player.cpp +++ b/src/kmediasession/mpris2/mediaplayer2player.cpp @@ -76,11 +76,6 @@ MediaPlayer2Player::MediaPlayer2Player(KMediaSession *audioPlayer, bool showProg } } -MediaPlayer2Player::~MediaPlayer2Player() -{ - qCDebug(Mpris2Log) << "MediaPlayer2Player::~MediaPlayer2Player()"; -} - QString MediaPlayer2Player::PlaybackStatus() const { qCDebug(Mpris2Log) << "MediaPlayer2Player::PlaybackStatus()"; diff --git a/src/kmediasession/mpris2/mediaplayer2player.h b/src/kmediasession/mpris2/mediaplayer2player.h index 4053aaea..b3b5ade8 100644 --- a/src/kmediasession/mpris2/mediaplayer2player.h +++ b/src/kmediasession/mpris2/mediaplayer2player.h @@ -38,7 +38,6 @@ class MediaPlayer2Player : public QDBusAbstractAdaptor public: explicit MediaPlayer2Player(KMediaSession *audioPlayer, bool showProgressOnTaskBar, QObject *parent = nullptr); - ~MediaPlayer2Player() override; QString PlaybackStatus() const; double Rate() const; diff --git a/src/kmediasession/mpris2/mpris2.cpp b/src/kmediasession/mpris2/mpris2.cpp index 7ed39fa3..1aec5c0f 100644 --- a/src/kmediasession/mpris2/mpris2.cpp +++ b/src/kmediasession/mpris2/mpris2.cpp @@ -97,10 +97,7 @@ bool Mpris2::unregisterDBusService(const QString &playerName) return success; } -Mpris2::~Mpris2() -{ - qCDebug(Mpris2Log) << "Mpris2::~Mpris2()"; -} +Mpris2::~Mpris2() = default; bool Mpris2::showProgressOnTaskBar() const { diff --git a/src/utils/systrayicon.cpp b/src/utils/systrayicon.cpp index 2066410d..da28ebe2 100644 --- a/src/utils/systrayicon.cpp +++ b/src/utils/systrayicon.cpp @@ -133,10 +133,6 @@ SystrayIcon::SystrayIcon(QObject *parent) } #endif -SystrayIcon::~SystrayIcon() -{ -} - bool SystrayIcon::available() const { #ifndef Q_OS_ANDROID diff --git a/src/utils/systrayicon.h b/src/utils/systrayicon.h index 30a1ff93..a2006ff2 100644 --- a/src/utils/systrayicon.h +++ b/src/utils/systrayicon.h @@ -36,8 +36,6 @@ public: return _instance; } - ~SystrayIcon() override; - [[nodiscard]] bool available() const; void setIconColor(IconColor iconColor); diff --git a/src/utils/updatefeedjob.cpp b/src/utils/updatefeedjob.cpp index d00d55c0..b9897070 100644 --- a/src/utils/updatefeedjob.cpp +++ b/src/utils/updatefeedjob.cpp @@ -41,11 +41,6 @@ UpdateFeedJob::UpdateFeedJob(const QString &url, const QByteArray &data, QObject connect(this, &UpdateFeedJob::feedUpdateStatusChanged, &Fetcher::instance(), &Fetcher::feedUpdateStatusChanged); } -UpdateFeedJob::~UpdateFeedJob() -{ - qCDebug(kastsFetcher) << "destroyed UpdateFeedJob for" << m_url; -} - void UpdateFeedJob::run(JobPointer, Thread *) { if (m_abort) { diff --git a/src/utils/updatefeedjob.h b/src/utils/updatefeedjob.h index 654c70ed..be7573a7 100644 --- a/src/utils/updatefeedjob.h +++ b/src/utils/updatefeedjob.h @@ -22,7 +22,6 @@ class UpdateFeedJob : public QObject, public ThreadWeaver::Job public: explicit UpdateFeedJob(const QString &url, const QByteArray &data, QObject *parent = nullptr); - ~UpdateFeedJob(); void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override; void abort();