diff --git a/src/analyzer/boomanalyzer.cpp b/src/analyzer/boomanalyzer.cpp
index 19c7857ce..734927a38 100644
--- a/src/analyzer/boomanalyzer.cpp
+++ b/src/analyzer/boomanalyzer.cpp
@@ -171,4 +171,3 @@ void BoomAnalyzer::analyze(QPainter& p, const Scope& scope, bool new_frame) {
   p.drawPixmap(0, 0, canvas_);
 
 }
-
diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp
index 4d5fef6ac..712671356 100644
--- a/src/collection/collectionbackend.cpp
+++ b/src/collection/collectionbackend.cpp
@@ -1458,4 +1458,3 @@ void CollectionBackend::UpdateSongRatingAsync(const int id, const float rating)
 void CollectionBackend::UpdateSongsRatingAsync(const QList<int>& ids, const float rating) {
   metaObject()->invokeMethod(this, "UpdateSongsRating", Qt::QueuedConnection, Q_ARG(QList<int>, ids), Q_ARG(float, rating));
 }
-
diff --git a/src/collection/collectionitemdelegate.cpp b/src/collection/collectionitemdelegate.cpp
index 63d265192..505ecdc25 100644
--- a/src/collection/collectionitemdelegate.cpp
+++ b/src/collection/collectionitemdelegate.cpp
@@ -164,4 +164,3 @@ bool CollectionItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *vie
   return false;
 
 }
-
diff --git a/src/collection/groupbydialog.cpp b/src/collection/groupbydialog.cpp
index 2d8f72f33..72c0e95d8 100644
--- a/src/collection/groupbydialog.cpp
+++ b/src/collection/groupbydialog.cpp
@@ -130,4 +130,3 @@ void GroupByDialog::CollectionGroupingChanged(const CollectionModel::Grouping &g
   ui_->combobox_second->setCurrentIndex(p_->mapping_.get<tag_group_by>().find(g[1])->combo_box_index);
   ui_->combobox_third->setCurrentIndex(p_->mapping_.get<tag_group_by>().find(g[2])->combo_box_index);
 }
-
diff --git a/src/collection/savedgroupingmanager.cpp b/src/collection/savedgroupingmanager.cpp
index 1e242723c..9869ab5bc 100644
--- a/src/collection/savedgroupingmanager.cpp
+++ b/src/collection/savedgroupingmanager.cpp
@@ -209,4 +209,3 @@ void SavedGroupingManager::UpdateButtonState() {
   }
 
 }
-
diff --git a/src/collection/sqlrow.h b/src/collection/sqlrow.h
index 552dbf9cc..8d208b0cf 100644
--- a/src/collection/sqlrow.h
+++ b/src/collection/sqlrow.h
@@ -49,5 +49,4 @@ class SqlRow {
 
 typedef QList<SqlRow> SqlRowList;
 
-#endif
-
+#endif  // SQLROW_H
diff --git a/src/context/contextalbumsview.h b/src/context/contextalbumsview.h
index 24f8770af..e818f418f 100644
--- a/src/context/contextalbumsview.h
+++ b/src/context/contextalbumsview.h
@@ -135,4 +135,3 @@ class ContextAlbumsView : public AutoExpandingTreeView {
 };
 
 #endif  // CONTEXTALBUMSVIEW_H
-
diff --git a/src/core/appearance.cpp b/src/core/appearance.cpp
index 536288e43..9bed14101 100644
--- a/src/core/appearance.cpp
+++ b/src/core/appearance.cpp
@@ -91,4 +91,3 @@ void Appearance::ChangeBackgroundColor(const QColor &color) {
   background_color_ = color;
 
 }
-
diff --git a/src/core/appearance.h b/src/core/appearance.h
index ea5fdc437..2227c8fa1 100644
--- a/src/core/appearance.h
+++ b/src/core/appearance.h
@@ -44,4 +44,3 @@ class Appearance : public QObject {
 };
 
 #endif  // APPEARANCE_H
-
diff --git a/src/core/commandlineoptions.cpp b/src/core/commandlineoptions.cpp
index f6d5e73e2..b0950811e 100644
--- a/src/core/commandlineoptions.cpp
+++ b/src/core/commandlineoptions.cpp
@@ -398,4 +398,3 @@ QDataStream& operator>>(QDataStream &s, CommandlineOptions &a) {
   return s;
 
 }
-
diff --git a/src/core/deletefiles.cpp b/src/core/deletefiles.cpp
index f47187f67..dc93366e8 100644
--- a/src/core/deletefiles.cpp
+++ b/src/core/deletefiles.cpp
@@ -123,4 +123,3 @@ void DeleteFiles::ProcessSomeFiles() {
   QTimer::singleShot(0, this, &DeleteFiles::ProcessSomeFiles);
 
 }
-
diff --git a/src/core/filesystemwatcherinterface.h b/src/core/filesystemwatcherinterface.h
index 3aa9463db..d342a7417 100644
--- a/src/core/filesystemwatcherinterface.h
+++ b/src/core/filesystemwatcherinterface.h
@@ -44,4 +44,3 @@ class FileSystemWatcherInterface : public QObject {
 };
 
 #endif
-
diff --git a/src/core/macfslistener.h b/src/core/macfslistener.h
index 11ad9d2d1..9ba08d852 100644
--- a/src/core/macfslistener.h
+++ b/src/core/macfslistener.h
@@ -61,5 +61,4 @@ class MacFSListener : public FileSystemWatcherInterface {
   QTimer *update_timer_;
 };
 
-#endif
-
+#endif  // MACFSLISTENER_H
diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h
index dc9ee52de..5e3e88bbb 100644
--- a/src/core/mainwindow.h
+++ b/src/core/mainwindow.h
@@ -393,4 +393,3 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 };
 
 #endif  // MAINWINDOW_H
-
diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h
index 1f827dc0e..521ee98f5 100644
--- a/src/core/mergedproxymodel.h
+++ b/src/core/mergedproxymodel.h
@@ -114,4 +114,3 @@ class MergedProxyModel : public QAbstractProxyModel {
 };
 
 #endif  // MERGEDPROXYMODEL_H
-
diff --git a/src/core/metatypes.h b/src/core/metatypes.h
index d757794af..a0cdd2066 100644
--- a/src/core/metatypes.h
+++ b/src/core/metatypes.h
@@ -3,4 +3,4 @@
 
 void RegisterMetaTypes();
 
-#endif
+#endif  // METATYPES_H
diff --git a/src/core/mimedata.h b/src/core/mimedata.h
index d4c9a9dc1..e16e39ace 100644
--- a/src/core/mimedata.h
+++ b/src/core/mimedata.h
@@ -75,4 +75,3 @@ class MimeData : public QMimeData {
 };
 
 #endif  // MIMEDATA_H
-
diff --git a/src/core/mpris2.h b/src/core/mpris2.h
index 7811a631a..68c14c6d3 100644
--- a/src/core/mpris2.h
+++ b/src/core/mpris2.h
@@ -243,4 +243,4 @@ class Mpris2 : public QObject {
 }  // namespace mpris
 
 
-#endif
+#endif  // MPRIS2_H
diff --git a/src/core/mpris_common.h b/src/core/mpris_common.h
index b78dc9dc5..755a19338 100644
--- a/src/core/mpris_common.h
+++ b/src/core/mpris_common.h
@@ -61,4 +61,4 @@ inline QString AsMPRISDateTimeType(const int time) {
 
 } // namespace mpris
 
-#endif // MPRIS_COMMON_H
+#endif  // MPRIS_COMMON_H
diff --git a/src/core/multisortfilterproxy.cpp b/src/core/multisortfilterproxy.cpp
index b8eacc43c..8c28a2d6e 100644
--- a/src/core/multisortfilterproxy.cpp
+++ b/src/core/multisortfilterproxy.cpp
@@ -106,4 +106,3 @@ int MultiSortFilterProxy::Compare(const QVariant &left, const QVariant &right) c
   return 0;
 
 }
-
diff --git a/src/core/networkproxyfactory.cpp b/src/core/networkproxyfactory.cpp
index 40a2ea396..686c8cf74 100644
--- a/src/core/networkproxyfactory.cpp
+++ b/src/core/networkproxyfactory.cpp
@@ -142,4 +142,3 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &q
   return QList<QNetworkProxy>() << ret;
 
 }
-
diff --git a/src/core/scopedtransaction.cpp b/src/core/scopedtransaction.cpp
index ccda32914..c031e92a8 100644
--- a/src/core/scopedtransaction.cpp
+++ b/src/core/scopedtransaction.cpp
@@ -46,4 +46,3 @@ void ScopedTransaction::Commit() {
   db_->commit();
   pending_ = false;
 }
-
diff --git a/src/core/settingsprovider.cpp b/src/core/settingsprovider.cpp
index 503b4af02..7d9889f49 100644
--- a/src/core/settingsprovider.cpp
+++ b/src/core/settingsprovider.cpp
@@ -53,4 +53,3 @@ void DefaultSettingsProvider::setArrayIndex(int i) {
 }
 
 void DefaultSettingsProvider::endArray() { backend_.endArray(); }
-
diff --git a/src/core/signalchecker.cpp b/src/core/signalchecker.cpp
index 36448d689..ac5b865e5 100644
--- a/src/core/signalchecker.cpp
+++ b/src/core/signalchecker.cpp
@@ -50,4 +50,3 @@ gulong CheckedGConnect(gpointer source, const char *signal, GCallback callback,
   return g_signal_connect(source, signal, G_CALLBACK(callback), data);
 
 }
-
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index 27c4907db..d0429bb46 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -176,4 +176,3 @@ QImage TagReaderClient::LoadEmbeddedArtBlocking(const QString &filename) {
   return ret;
 
 }
-
diff --git a/src/core/taskmanager.cpp b/src/core/taskmanager.cpp
index 54983beb5..bcfa541a8 100644
--- a/src/core/taskmanager.cpp
+++ b/src/core/taskmanager.cpp
@@ -140,4 +140,3 @@ int TaskManager::GetTaskProgress(int id) {
   }
 
 }
-
diff --git a/src/core/thread.h b/src/core/thread.h
index 89ffbf5fc..1a2c97f0c 100644
--- a/src/core/thread.h
+++ b/src/core/thread.h
@@ -29,7 +29,7 @@ class QObject;
 // Improve QThread by adding a SetIoPriority function
 class Thread : public QThread {
  public:
-  explicit Thread(QObject* parent = nullptr) : QThread(parent), io_priority_(Utilities::IOPRIO_CLASS_NONE) {}
+  explicit Thread(QObject *parent = nullptr) : QThread(parent), io_priority_(Utilities::IOPRIO_CLASS_NONE) {}
 
   void SetIoPriority(Utilities::IoPriority priority) {
     io_priority_ = priority;
diff --git a/src/covermanager/albumcoverexport.cpp b/src/covermanager/albumcoverexport.cpp
index ef93e74c1..a3c8ae91c 100644
--- a/src/covermanager/albumcoverexport.cpp
+++ b/src/covermanager/albumcoverexport.cpp
@@ -100,4 +100,3 @@ void AlbumCoverExport::ForceSizeToggled(int state) {
   ui_->width->setEnabled(state == Qt::Checked);
   ui_->height->setEnabled(state == Qt::Checked);
 }
-
diff --git a/src/covermanager/albumcoverfetcher.cpp b/src/covermanager/albumcoverfetcher.cpp
index d20965d90..2472fda80 100644
--- a/src/covermanager/albumcoverfetcher.cpp
+++ b/src/covermanager/albumcoverfetcher.cpp
@@ -154,4 +154,3 @@ void AlbumCoverFetcher::SingleCoverFetched(const quint64 request_id, const QUrl
   emit AlbumCoverFetched(request_id, cover_url, image, search->statistics());
 
 }
-
diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h
index 47c076d5a..989319461 100644
--- a/src/covermanager/albumcoverloader.h
+++ b/src/covermanager/albumcoverloader.h
@@ -144,4 +144,3 @@ class AlbumCoverLoader : public QObject {
 };
 
 #endif  // ALBUMCOVERLOADER_H
-
diff --git a/src/covermanager/albumcovermanagerlist.h b/src/covermanager/albumcovermanagerlist.h
index f1d826508..83728d941 100644
--- a/src/covermanager/albumcovermanagerlist.h
+++ b/src/covermanager/albumcovermanagerlist.h
@@ -53,7 +53,7 @@ class AlbumCoverManagerList : public QListWidget {
   void dropEvent(QDropEvent *event) override;
 
  private:
-  AlbumCoverManager* manager_;
+  AlbumCoverManager *manager_;
 };
 
 #endif  // ALBUMCOVERMANAGERLIST_H
diff --git a/src/covermanager/albumcoversearcher.cpp b/src/covermanager/albumcoversearcher.cpp
index 852b9262e..3db1ecc9f 100644
--- a/src/covermanager/albumcoversearcher.cpp
+++ b/src/covermanager/albumcoversearcher.cpp
@@ -285,4 +285,3 @@ void AlbumCoverSearcher::keyPressEvent(QKeyEvent *e) {
 void AlbumCoverSearcher::CoverDoubleClicked(const QModelIndex &idx) {
   if (idx.isValid()) accept();
 }
-
diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp
index 387d51b7a..070b1bc40 100644
--- a/src/covermanager/coverexportrunnable.cpp
+++ b/src/covermanager/coverexportrunnable.cpp
@@ -199,4 +199,3 @@ void CoverExportRunnable::ExportCover() {
 void CoverExportRunnable::EmitCoverExported() { emit CoverExported(); }
 
 void CoverExportRunnable::EmitCoverSkipped() { emit CoverSkipped(); }
-
diff --git a/src/covermanager/coverfromurldialog.cpp b/src/covermanager/coverfromurldialog.cpp
index 883ea7767..f66efdfc6 100644
--- a/src/covermanager/coverfromurldialog.cpp
+++ b/src/covermanager/coverfromurldialog.cpp
@@ -101,4 +101,3 @@ void CoverFromURLDialog::LoadCoverFromURLFinished() {
   }
 
 }
-
diff --git a/src/covermanager/coversearchstatistics.cpp b/src/covermanager/coversearchstatistics.cpp
index 09327f502..e2ecf9e53 100644
--- a/src/covermanager/coversearchstatistics.cpp
+++ b/src/covermanager/coversearchstatistics.cpp
@@ -64,4 +64,3 @@ QString CoverSearchStatistics::AverageDimensions() const {
   return QString::number(chosen_width_ / chosen_images_) + "x" + QString::number(chosen_height_ / chosen_images_);
 
 }
-
diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp
index 814d1b933..4e80e4313 100644
--- a/src/organize/organizedialog.cpp
+++ b/src/organize/organizedialog.cpp
@@ -447,11 +447,11 @@ SongList OrganizeDialog::LoadSongsBlocking(const QStringList &filenames) {
 }
 
 void OrganizeDialog::SetCopy(const bool copy) {
-    ui_->aftercopying->setCurrentIndex(copy ? 0 : 1);
+  ui_->aftercopying->setCurrentIndex(copy ? 0 : 1);
 }
 
 void OrganizeDialog::SetPlaylist(const QString &playlist) {
-    playlist_ = playlist;
+  playlist_ = playlist;
 }
 
 void OrganizeDialog::InsertTag(const QString &tag) {
diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp
index dc349d90e..2c6879a7f 100644
--- a/src/playlist/playlistbackend.cpp
+++ b/src/playlist/playlistbackend.cpp
@@ -477,4 +477,3 @@ void PlaylistBackend::SetPlaylistUiPath(int id, const QString &path) {
   transaction.Commit();
 
 }
-
diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp
index 686fabcda..20ae81130 100644
--- a/src/playlist/playlistheader.cpp
+++ b/src/playlist/playlistheader.cpp
@@ -177,4 +177,3 @@ void PlaylistHeader::ResetColumns() {
 void PlaylistHeader::ToggleRatingEditStatus() {
   emit SectionRatingLockStatusChanged(action_rating_lock_->isChecked());
 }
-
diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp
index ac33cbbc2..19d2b94fa 100644
--- a/src/playlist/playlistitem.cpp
+++ b/src/playlist/playlistitem.cpp
@@ -154,4 +154,3 @@ bool PlaylistItem::HasCurrentForegroundColor() const {
 }
 void PlaylistItem::SetShouldSkip(bool val) { should_skip_ = val; }
 bool PlaylistItem::GetShouldSkip() const { return should_skip_; }
-
diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp
index 43fca4dc1..7c567ed3d 100644
--- a/src/playlist/playlistmanager.cpp
+++ b/src/playlist/playlistmanager.cpp
@@ -641,4 +641,3 @@ void PlaylistManager::RateCurrentSong(const double rating) {
 void PlaylistManager::RateCurrentSong(const int rating) {
   RateCurrentSong(rating / 5.0);
 }
-
diff --git a/src/playlist/playlistsaveoptionsdialog.cpp b/src/playlist/playlistsaveoptionsdialog.cpp
index b28729798..fe0dc2df5 100644
--- a/src/playlist/playlistsaveoptionsdialog.cpp
+++ b/src/playlist/playlistsaveoptionsdialog.cpp
@@ -59,4 +59,3 @@ void PlaylistSaveOptionsDialog::accept() {
 Playlist::Path PlaylistSaveOptionsDialog::path_type() const {
   return static_cast<Playlist::Path>(ui->filePaths->itemData(ui->filePaths->currentIndex()).toInt());
 }
-
diff --git a/src/playlist/songloaderinserter.cpp b/src/playlist/songloaderinserter.cpp
index 281f341c6..9bec1ad26 100644
--- a/src/playlist/songloaderinserter.cpp
+++ b/src/playlist/songloaderinserter.cpp
@@ -39,8 +39,7 @@ SongLoaderInserter::SongLoaderInserter(TaskManager *task_manager, CollectionBack
       enqueue_(false),
       enqueue_next_(false),
       collection_(collection),
-      player_(player) {
-    }
+      player_(player) {}
 
 SongLoaderInserter::~SongLoaderInserter() { qDeleteAll(pending_); }
 
@@ -214,4 +213,3 @@ void SongLoaderInserter::AsyncLoad() {
   deleteLater();
 
 }
-
diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp
index 4ff982781..2f694d681 100644
--- a/src/qobuz/qobuzrequest.cpp
+++ b/src/qobuz/qobuzrequest.cpp
@@ -1343,4 +1343,3 @@ void QobuzRequest::Warn(const QString &error, const QVariant &debug) {
   if (debug.isValid()) qLog(Debug) << debug;
 
 }
-
diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp
index d27eb6bdd..81e0d4926 100644
--- a/src/qobuz/qobuzstreamurlrequest.cpp
+++ b/src/qobuz/qobuzstreamurlrequest.cpp
@@ -246,4 +246,3 @@ void QobuzStreamURLRequest::Error(const QString &error, const QVariant &debug) {
   if (debug.isValid()) qLog(Debug) << debug;
 
 }
-
diff --git a/src/queue/queueview.cpp b/src/queue/queueview.cpp
index 145d73d98..9a499313d 100644
--- a/src/queue/queueview.cpp
+++ b/src/queue/queueview.cpp
@@ -192,4 +192,3 @@ void QueueView::PlaylistDestroyed() {
   current_playlist_ = nullptr;
   // We'll get another CurrentPlaylistChanged() soon
 }
-
diff --git a/src/settings/moodbarsettingspage.cpp b/src/settings/moodbarsettingspage.cpp
index 93564e3b6..a76b701d1 100644
--- a/src/settings/moodbarsettingspage.cpp
+++ b/src/settings/moodbarsettingspage.cpp
@@ -109,6 +109,7 @@ void MoodbarSettingsPage::InitMoodbarPreviews() {
     return;
   }
   QByteArray file_data = file.readAll();
+  file.close();
 
   // Render and set each preview
   for (int i = 0; i < MoodbarRenderer::StyleCount; ++i) {
diff --git a/src/settings/playlistsettingspage.cpp b/src/settings/playlistsettingspage.cpp
index 5f8e67a8c..539a092d6 100644
--- a/src/settings/playlistsettingspage.cpp
+++ b/src/settings/playlistsettingspage.cpp
@@ -35,7 +35,7 @@ class SettingsDialog;
 
 const char *PlaylistSettingsPage::kSettingsGroup = "Playlist";
 
-PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog* dialog) : SettingsPage(dialog), ui_(new Ui_PlaylistSettingsPage) {
+PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog *dialog) : SettingsPage(dialog), ui_(new Ui_PlaylistSettingsPage) {
 
   ui_->setupUi(this);
   setWindowIcon(IconLoader::Load("document-new"));
@@ -101,8 +101,6 @@ void PlaylistSettingsPage::Load() {
 
 void PlaylistSettingsPage::Save() {
 
-  QSettings s;
-
   Playlist::Path path = Playlist::Path_Automatic;
   if (ui_->radiobutton_automaticpath->isChecked()) {
     path = Playlist::Path_Automatic;
@@ -117,6 +115,7 @@ void PlaylistSettingsPage::Save() {
     path = Playlist::Path_Ask_User;
   }
 
+  QSettings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("glow_effect", ui_->checkbox_glowcurrenttrack->isChecked());
   s.setValue("warn_close_playlist", ui_->checkbox_warncloseplaylist->isChecked());
diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp
index bf1609aa6..ee1845f11 100644
--- a/src/settings/scrobblersettingspage.cpp
+++ b/src/settings/scrobblersettingspage.cpp
@@ -277,5 +277,3 @@ void ScrobblerSettingsPage::ListenBrainz_AuthenticationComplete(const bool succe
 void ScrobblerSettingsPage::ListenBrainz_RefreshControls(bool authenticated) {
   ui_->widget_listenbrainz_login_state->SetLoggedIn(authenticated ? LoginStateWidget::LoggedIn : LoginStateWidget::LoggedOut);
 }
-
-
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 0be8a0a2f..c4ea807ec 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -370,4 +370,3 @@ void SettingsDialog::CurrentItemChanged(QTreeWidgetItem *item) {
   }
 
 }
-
diff --git a/src/settings/settingspage.cpp b/src/settings/settingspage.cpp
index e11b52365..a8074b01e 100644
--- a/src/settings/settingspage.cpp
+++ b/src/settings/settingspage.cpp
@@ -146,4 +146,3 @@ void SettingsPage::ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combo
   combobox->setCurrentIndex(i);
 
 }
-
diff --git a/src/subsonic/subsonicurlhandler.cpp b/src/subsonic/subsonicurlhandler.cpp
index c8cf4c0c0..86a986786 100644
--- a/src/subsonic/subsonicurlhandler.cpp
+++ b/src/subsonic/subsonicurlhandler.cpp
@@ -71,4 +71,3 @@ UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl &url) {
   return LoadResult(url, LoadResult::TrackAvailable, stream_url);
 
 }
-
diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp
index 5f0a22dd5..404612ba4 100644
--- a/src/transcoder/transcodedialog.cpp
+++ b/src/transcoder/transcodedialog.cpp
@@ -458,4 +458,3 @@ QString TranscodeDialog::GetOutputFileName(const QString &input, const Transcode
   }
 
 }
-
diff --git a/src/transcoder/transcoderoptionsopus.cpp b/src/transcoder/transcoderoptionsopus.cpp
index 04be4bb75..befb65ad9 100644
--- a/src/transcoder/transcoderoptionsopus.cpp
+++ b/src/transcoder/transcoderoptionsopus.cpp
@@ -33,7 +33,7 @@
 
 // TODO: Add more options than only bitrate as soon as gst doesn't crash anymore while using the cbr parmameter (like cbr=false)
 
-const char* TranscoderOptionsOpus::kSettingsGroup = "Transcoder/opusenc";
+const char *TranscoderOptionsOpus::kSettingsGroup = "Transcoder/opusenc";
 
 TranscoderOptionsOpus::TranscoderOptionsOpus(QWidget *parent) : TranscoderOptionsInterface(parent), ui_(new Ui_TranscoderOptionsOpus) {
   ui_->setupUi(this);
diff --git a/src/transcoder/transcoderoptionsopus.h b/src/transcoder/transcoderoptionsopus.h
index 7051a4ee2..738a7bccc 100644
--- a/src/transcoder/transcoderoptionsopus.h
+++ b/src/transcoder/transcoderoptionsopus.h
@@ -38,9 +38,9 @@ class TranscoderOptionsOpus : public TranscoderOptionsInterface {
   void Save() override;
 
  private:
-  static const char* kSettingsGroup;
+  static const char *kSettingsGroup;
 
-  Ui_TranscoderOptionsOpus* ui_;
+  Ui_TranscoderOptionsOpus *ui_;
 };
 
 #endif  // TRANSCODEROPTIONSOPUS_H
diff --git a/src/widgets/autoexpandingtreeview.cpp b/src/widgets/autoexpandingtreeview.cpp
index 83bb6845d..669933ff0 100644
--- a/src/widgets/autoexpandingtreeview.cpp
+++ b/src/widgets/autoexpandingtreeview.cpp
@@ -192,4 +192,3 @@ void AutoExpandingTreeView::DownAndFocus() {
   setCurrentIndex(moveCursor(QAbstractItemView::MoveDown, Qt::NoModifier));
   setFocus();
 }
-
diff --git a/src/widgets/busyindicator.cpp b/src/widgets/busyindicator.cpp
index 5a32e9f97..8fb7dedcc 100644
--- a/src/widgets/busyindicator.cpp
+++ b/src/widgets/busyindicator.cpp
@@ -84,4 +84,3 @@ void BusyIndicator::set_text(const QString &text) {
 QString BusyIndicator::text() const {
   return label_->text();
 }
-
diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h
index 5b020078b..79fd58e4b 100644
--- a/src/widgets/multiloadingindicator.h
+++ b/src/widgets/multiloadingindicator.h
@@ -43,7 +43,7 @@ class MultiLoadingIndicator : public QWidget {
   static const int kHorizontalPadding;
   static const int kSpacing;
 
-  void SetTaskManager(TaskManager* task_manager);
+  void SetTaskManager(TaskManager *task_manager);
 
   QSize sizeHint() const override;
 
diff --git a/src/widgets/renametablineedit.cpp b/src/widgets/renametablineedit.cpp
index fdd9ad701..ceb0f652f 100644
--- a/src/widgets/renametablineedit.cpp
+++ b/src/widgets/renametablineedit.cpp
@@ -52,4 +52,3 @@ void RenameTabLineEdit::focusOutEvent(QFocusEvent *e) {
   //we don't call the default event since it will trigger editingFished()
 
 }
-
diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h
index 28b84ea66..a2c825ebb 100644
--- a/src/widgets/renametablineedit.h
+++ b/src/widgets/renametablineedit.h
@@ -35,7 +35,7 @@ class RenameTabLineEdit : public QLineEdit {
   Q_OBJECT
 
  public:
-  explicit RenameTabLineEdit(QWidget* parent = nullptr);
+  explicit RenameTabLineEdit(QWidget *parent = nullptr);
 
  signals:
   void EditingCanceled();
@@ -43,8 +43,8 @@ class RenameTabLineEdit : public QLineEdit {
  public slots:
 
  protected:
-  void focusOutEvent(QFocusEvent* e) override;
-  void keyPressEvent(QKeyEvent* e) override;
+  void focusOutEvent(QFocusEvent *e) override;
+  void keyPressEvent(QKeyEvent *e) override;
 };
 
 #endif  // RENAMETABLINEEDIT_H
diff --git a/src/widgets/stickyslider.h b/src/widgets/stickyslider.h
index b8761e2d7..f40f5ef5f 100644
--- a/src/widgets/stickyslider.h
+++ b/src/widgets/stickyslider.h
@@ -36,7 +36,7 @@ class StickySlider : public QSlider {
   Q_PROPERTY(int sticky_threshold READ sticky_threshold WRITE set_sticky_threshold)
 
  public:
-  explicit StickySlider(QWidget* parent = nullptr);
+  explicit StickySlider(QWidget *parent = nullptr);
 
   int sticky_center() const { return sticky_center_; }
   int sticky_threshold() const { return sticky_threshold_; }
@@ -44,7 +44,7 @@ class StickySlider : public QSlider {
   void set_sticky_threshold(int threshold) { sticky_threshold_ = threshold; }
 
  protected:
-  void mouseMoveEvent(QMouseEvent* e) override;
+  void mouseMoveEvent(QMouseEvent *e) override;
 
  private:
   int sticky_center_;
diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp
index 129b53199..dbe81a506 100644
--- a/src/widgets/stretchheaderview.cpp
+++ b/src/widgets/stretchheaderview.cpp
@@ -168,9 +168,9 @@ void StretchHeaderView::SetSectionHidden(const int logical, const bool hidden) {
 
 }
 
-void StretchHeaderView::resizeEvent(QResizeEvent *event) {
+void StretchHeaderView::resizeEvent(QResizeEvent *e) {
 
-  QHeaderView::resizeEvent(event);
+  QHeaderView::resizeEvent(e);
 
   if (!stretch_enabled_) return;
 
diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h
index b4f6be08b..5165acf8b 100644
--- a/src/widgets/stretchheaderview.h
+++ b/src/widgets/stretchheaderview.h
@@ -82,7 +82,7 @@ class StretchHeaderView : public QHeaderView {
  protected:
   // QWidget
   void mouseMoveEvent(QMouseEvent *e) override;
-  void resizeEvent(QResizeEvent *event) override;
+  void resizeEvent(QResizeEvent *e) override;
 
  private:
   // Scales column_widths_ values so the total is 1.0.
diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h
index 6c17f3cd3..578d843fc 100644
--- a/src/widgets/trackslider.h
+++ b/src/widgets/trackslider.h
@@ -41,7 +41,7 @@ class TrackSlider : public QWidget {
   Q_OBJECT
 
  public:
-  explicit TrackSlider(QWidget* parent = nullptr);
+  explicit TrackSlider(QWidget *parent = nullptr);
   ~TrackSlider() override;
 
   void SetApplication(Application* app);
diff --git a/src/widgets/tracksliderpopup.cpp b/src/widgets/tracksliderpopup.cpp
index b3016a342..429aa3e5c 100644
--- a/src/widgets/tracksliderpopup.cpp
+++ b/src/widgets/tracksliderpopup.cpp
@@ -45,7 +45,7 @@ const int TrackSliderPopup::kPointWidth = 4;
 const int TrackSliderPopup::kBorderRadius = 4;
 const qreal TrackSliderPopup::kBlurRadius = 20.0;
 
-TrackSliderPopup::TrackSliderPopup(QWidget* parent)
+TrackSliderPopup::TrackSliderPopup(QWidget *parent)
     : QWidget(parent),
       font_metrics_(fontMetrics()),
     small_font_metrics_(fontMetrics()) {
@@ -61,17 +61,17 @@ TrackSliderPopup::TrackSliderPopup(QWidget* parent)
 
 }
 
-void TrackSliderPopup::SetText(const QString& text) {
+void TrackSliderPopup::SetText(const QString &text) {
   text_ = text;
   UpdatePixmap();
 }
 
-void TrackSliderPopup::SetSmallText(const QString& text) {
+void TrackSliderPopup::SetSmallText(const QString &text) {
   small_text_ = text;
   UpdatePixmap();
 }
 
-void TrackSliderPopup::SetPopupPosition(const QPoint& pos) {
+void TrackSliderPopup::SetPopupPosition(const QPoint &pos) {
   pos_ = pos;
   UpdatePosition();
 }
diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h
index ef9e972be..aef98623f 100644
--- a/src/widgets/tracksliderpopup.h
+++ b/src/widgets/tracksliderpopup.h
@@ -38,13 +38,13 @@ class QPaintEvent;
 class TrackSliderPopup : public QWidget {
   Q_OBJECT
 
-public:
+ public:
   explicit TrackSliderPopup(QWidget *parent);
 
  public slots:
-  void SetText(const QString& text);
-  void SetSmallText(const QString& small_text);
-  void SetPopupPosition(const QPoint& pos);
+  void SetText(const QString &text);
+  void SetSmallText(const QString &small_text);
+  void SetPopupPosition(const QPoint &pos);
 
  protected:
   void paintEvent(QPaintEvent*) override;
@@ -58,7 +58,7 @@ public:
 
   void UpdatePixmap();
   void UpdatePosition();
-  void SendMouseEventToParent(QMouseEvent* e);
+  void SendMouseEventToParent(QMouseEvent *e);
 
  private:
   QString text_;
diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h
index 2c2f736f0..a1560a0a3 100644
--- a/src/widgets/tracksliderslider.h
+++ b/src/widgets/tracksliderslider.h
@@ -62,7 +62,7 @@ class TrackSliderSlider : public QSlider {
   void enterEvent(QEvent *e) override;
 #endif
   void leaveEvent(QEvent *e) override;
-  void keyPressEvent(QKeyEvent* event) override;
+  void keyPressEvent(QKeyEvent *event) override;
 
  private slots:
   void UpdateDeltaTime();
diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp
index 3478e43c9..fa8ea4400 100644
--- a/src/widgets/volumeslider.cpp
+++ b/src/widgets/volumeslider.cpp
@@ -56,7 +56,7 @@ SliderSlider::SliderSlider(Qt::Orientation orientation, QWidget* parent, uint ma
   setRange(0, max);
 }
 
-void SliderSlider::wheelEvent(QWheelEvent* e) {
+void SliderSlider::wheelEvent(QWheelEvent *e) {
 
   if (orientation() == Qt::Vertical) {
     // Will be handled by the parent widget
@@ -95,7 +95,7 @@ void SliderSlider::mouseMoveEvent(QMouseEvent *e) {
 
 }
 
-void SliderSlider::slideEvent(QMouseEvent* e) {
+void SliderSlider::slideEvent(QMouseEvent *e) {
 
   QStyleOptionSlider option;
   initStyleOption(&option);
@@ -118,7 +118,7 @@ void SliderSlider::slideEvent(QMouseEvent* e) {
 
 }
 
-void SliderSlider::mousePressEvent(QMouseEvent* e) {
+void SliderSlider::mousePressEvent(QMouseEvent *e) {
 
   QStyleOptionSlider option;
   initStyleOption(&option);
@@ -157,20 +157,20 @@ void SliderSlider::setValue(int newValue) {
 #define THICKNESS 7
 #define MARGIN 3
 
-PrettySlider::PrettySlider(Qt::Orientation orientation, SliderMode mode, QWidget* parent, uint max)
+PrettySlider::PrettySlider(Qt::Orientation orientation, SliderMode mode, QWidget *parent, uint max)
     : SliderSlider(orientation, parent, max), m_mode(mode) {
   if (m_mode == Pretty) {
     setFocusPolicy(Qt::NoFocus);
   }
 }
 
-void PrettySlider::mousePressEvent(QMouseEvent* e) {
+void PrettySlider::mousePressEvent(QMouseEvent *e) {
   SliderSlider::mousePressEvent(e);
 
   slideEvent(e);
 }
 
-void PrettySlider::slideEvent(QMouseEvent* e) {
+void PrettySlider::slideEvent(QMouseEvent *e) {
   if (m_mode == Pretty)
     QSlider::setValue(
         orientation() == Qt::Horizontal
@@ -207,7 +207,7 @@ QSize PrettySlider::sizeHint() const {
 /// CLASS VolumeSlider
 //////////////////////////////////////////////////////////////////////////////////////////
 
-VolumeSlider::VolumeSlider(QWidget* parent, uint max)
+VolumeSlider::VolumeSlider(QWidget *parent, uint max)
     : SliderSlider(Qt::Horizontal, parent, max),
       m_animCount(0),
       m_animTimer(new QTimer(this)),
@@ -268,7 +268,7 @@ void VolumeSlider::slotAnimTimer() {
 
 }
 
-void VolumeSlider::mousePressEvent(QMouseEvent* e) {
+void VolumeSlider::mousePressEvent(QMouseEvent *e) {
 
   if (e->button() != Qt::RightButton) {
     SliderSlider::mousePressEvent(e);
@@ -277,7 +277,7 @@ void VolumeSlider::mousePressEvent(QMouseEvent* e) {
 
 }
 
-void VolumeSlider::contextMenuEvent(QContextMenuEvent* e) {
+void VolumeSlider::contextMenuEvent(QContextMenuEvent *e) {
 
   QMap<QAction*, int> values;
   QMenu menu;
@@ -289,7 +289,7 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent* e) {
   values[menu.addAction("20%")] = 20;
   values[menu.addAction("0%")] = 0;
 
-  QAction* ret = menu.exec(mapToGlobal(e->pos()));
+  QAction *ret = menu.exec(mapToGlobal(e->pos()));
   if (ret) {
     QSlider::setValue(values[ret]);
     emit sliderReleased(values[ret]);
@@ -297,11 +297,11 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent* e) {
 
 }
 
-void VolumeSlider::slideEvent(QMouseEvent* e) {
+void VolumeSlider::slideEvent(QMouseEvent *e) {
   QSlider::setValue(QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x(), width() - 2));
 }
 
-void VolumeSlider::wheelEvent(QWheelEvent* e) {
+void VolumeSlider::wheelEvent(QWheelEvent *e) {
 
   const uint step = e->angleDelta().y() / (e->angleDelta().x() == 0 ? 30 : -30);
   QSlider::setValue(QSlider::value() + step);
diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h
index 728e3944b..cb522efb3 100644
--- a/src/widgets/volumeslider.h
+++ b/src/widgets/volumeslider.h
@@ -130,7 +130,7 @@ class VolumeSlider : public SliderSlider {
   void drawVolumeSliderHandle();
 
   VolumeSlider(const VolumeSlider&);             // undefined
-  VolumeSlider& operator=(const VolumeSlider&);  // undefined
+  VolumeSlider &operator=(const VolumeSlider&);  // undefined
 
   ////////////////////////////////////////////////////////////////
   static const int ANIM_INTERVAL = 18;
@@ -138,7 +138,7 @@ class VolumeSlider : public SliderSlider {
 
   bool m_animEnter;
   int m_animCount;
-  QTimer* m_animTimer;
+  QTimer *m_animTimer;
 
   QPixmap m_pixmapInset;
   QPixmap m_pixmapGradient;