Formatting

ext/libstrawberry-common/core/logging.cpp

@@ -61,7 +61,7 @@ static const char *kMessageHandlerMagic = "__logging_message__";
 static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
-template <class T>
+template<class T>
 static T CreateLogger(Level level, const QString &class_name, int line, const char *category);
 
 void GLog(const char *domain, int level, const char *message, void*) {
@@ -85,10 +85,9 @@ void GLog(const char *domain, int level, const char *message, void*) {
       qLogCat(Debug, domain) << message;
       break;
   }
-
 }
 
-template <class T>
+template<class T>
 class DebugBase : public QDebug {
  public:
   DebugBase() : QDebug(sNullDevice) {}
@@ -314,11 +313,11 @@ QString LinuxDemangle(const QString &symbol) {
 QString DarwinDemangle(const QString &symbol);
 QString DarwinDemangle(const QString &symbol) {
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
   QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
-#else
+#  else
   QStringList split = symbol.split(' ', QString::SkipEmptyParts);
-#endif
+#  endif
   QString mangled_function = split[3];
   return CXXDemangle(mangled_function);
 
@@ -379,7 +378,7 @@ QDebug CreateLoggerError(int line, const char *pretty_function, const char *cate
 
 namespace {
 
-template <typename T>
+template<typename T>
 QString print_duration(T duration, const std::string &unit) {
   return QString("%1%2").arg(duration.count()).arg(unit.c_str());
 }

ext/libstrawberry-common/core/messagehandler.h

@@ -79,7 +79,7 @@ class _MessageHandlerBase : public QObject {
 
 // Reads and writes uint32 length encoded MessageType messages to a socket.
 // You should subclass this and implement the MessageArrived(MessageType) method.
-template <typename MT>
+template<typename MT>
 class AbstractMessageHandler : public _MessageHandlerBase {
  public:
   AbstractMessageHandler(QIODevice *device, QObject *parent);
@@ -115,11 +115,11 @@ class AbstractMessageHandler : public _MessageHandlerBase {
   QMap<int, ReplyType*> pending_replies_;
 };
 
-template <typename MT>
+template<typename MT>
 AbstractMessageHandler<MT>::AbstractMessageHandler(QIODevice *device, QObject *parent)
     : _MessageHandlerBase(device, parent) {}
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   Q_ASSERT(QThread::currentThread() == thread());
 
@@ -127,7 +127,7 @@ void AbstractMessageHandler<MT>::SendMessage(const MessageType &message) {
   WriteMessage(QByteArray(data.data(), data.size()));
 }
 
-template <typename MT>
+template<typename MT>
 void AbstractMessageHandler<MT>::SendMessageAsync(const MessageType &message) {
   std::string data = message.SerializeAsString();
   QMetaObject::invokeMethod(this, "WriteMessage", Qt::QueuedConnection, Q_ARG(QByteArray, QByteArray(data.data(), data.size())));

ext/libstrawberry-common/core/messagereply.h

@@ -56,7 +56,7 @@ class _MessageReplyBase : public QObject {
 };
 
 // A reply future class that is returned immediately for requests that will occur in the background.  Similar to QNetworkReply.
-template <typename MessageType>
+template<typename MessageType>
 class MessageReply : public _MessageReplyBase {
  public:
   explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);

ext/libstrawberry-common/core/workerpool.h

@@ -70,7 +70,7 @@ class _WorkerPoolBase : public QObject {
 // A local socket server is started for each process, and the address is passed to the process as argv[1].
 // The process is expected to connect back to the socket server, and when it does a HandlerType is created for it.
 // Instances of HandlerType are created in the WorkerPool's thread.
-template <typename HandlerType>
+template<typename HandlerType>
 class WorkerPool : public _WorkerPoolBase {
  public:
   explicit WorkerPool(QObject *parent = nullptr);
@@ -121,9 +121,9 @@ class WorkerPool : public _WorkerPoolBase {
   // Must only ever be called on my thread.
   void StartOneWorker(Worker *worker);
 
-  template <typename T>
+  template<typename T>
   Worker *FindWorker(T Worker::*member, T value) {
-    for (typename QList<Worker>::iterator it = workers_.begin() ; it != workers_.end() ; ++it) {
+    for (typename QList<Worker>::iterator it = workers_.begin(); it != workers_.end(); ++it) {
       if ((*it).*member == value) {
         return &(*it);
       }
@@ -131,7 +131,7 @@ class WorkerPool : public _WorkerPoolBase {
     return nullptr;
   }
 
-  template <typename T>
+  template<typename T>
   void DeleteQObjectPointerLater(T **p) {
     if (*p) {
       (*p)->deleteLater();
@@ -158,11 +158,11 @@ class WorkerPool : public _WorkerPoolBase {
   QAtomicInt next_id_;
 
   QMutex message_queue_mutex_;
-  QQueue<ReplyType*> message_queue_;
+  QQueue<ReplyType *> message_queue_;
 };
 
 
-template <typename HandlerType>
+template<typename HandlerType>
 WorkerPool<HandlerType>::WorkerPool(QObject *parent)
     : _WorkerPoolBase(parent),
       next_worker_(0),
@@ -174,10 +174,9 @@ WorkerPool<HandlerType>::WorkerPool(QObject *parent)
   if (local_server_name_.isEmpty()) {
     local_server_name_ = "workerpool";
   }
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 WorkerPool<HandlerType>::~WorkerPool() {
 
   for (const Worker &worker : workers_) {
@@ -205,33 +204,32 @@ WorkerPool<HandlerType>::~WorkerPool() {
   for (ReplyType *reply : message_queue_) {
     reply->Abort();
   }
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetWorkerCount(const int count) {
   Q_ASSERT(workers_.isEmpty());
   worker_count_ = count;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetLocalServerName(const QString &local_server_name) {
   Q_ASSERT(workers_.isEmpty());
   local_server_name_ = local_server_name;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SetExecutableName(const QString &executable_name) {
   Q_ASSERT(workers_.isEmpty());
   executable_name_ = executable_name;
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::Start() {
   QMetaObject::invokeMethod(this, "DoStart");
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::DoStart() {
 
   Q_ASSERT(workers_.isEmpty());
@@ -267,10 +265,9 @@ void WorkerPool<HandlerType>::DoStart() {
 
     workers_ << worker;
   }
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -311,10 +308,9 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 #endif
 
   worker->process_->start(executable_path_, QStringList() << worker->local_server_->fullServerName());
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::NewConnection() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -339,10 +335,9 @@ void WorkerPool<HandlerType>::NewConnection() {
   worker->handler_ = new HandlerType(worker->local_socket_, this);
 
   SendQueuedMessages();
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -367,10 +362,9 @@ void WorkerPool<HandlerType>::ProcessError(QProcess::ProcessError error) {
       StartOneWorker(worker);
       break;
   }
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -380,10 +374,9 @@ void WorkerPool<HandlerType>::ProcessReadyReadStandardOutput() {
 
   fprintf(stdout, "%s", data.data());
   fflush(stdout);
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::ProcessReadyReadStandardError() {
 
   Q_ASSERT(QThread::currentThread() == thread());
@@ -423,10 +416,9 @@ WorkerPool<HandlerType>::SendMessageWithReply(MessageType *message) {
   QMetaObject::invokeMethod(this, "SendQueuedMessages", Qt::QueuedConnection);
 
   return reply;
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 void WorkerPool<HandlerType>::SendQueuedMessages() {
 
   QMutexLocker l(&message_queue_mutex_);
@@ -445,10 +437,9 @@ void WorkerPool<HandlerType>::SendQueuedMessages() {
 
     handler->SendRequest(reply);
   }
-
 }
 
-template <typename HandlerType>
+template<typename HandlerType>
 HandlerType *WorkerPool<HandlerType>::NextHandler() const {
 
   for (int i = 0; i < workers_.count(); ++i) {

ext/libstrawberry-tagreader/tagreadertaglib.cpp

@@ -113,6 +113,7 @@ class TagLibFileRefFactory : public FileRefFactory {
     return new TagLib::FileRef(QFile::encodeName(filename).constData());
 #endif
   }
+
  private:
   Q_DISABLE_COPY(TagLibFileRefFactory)
 };
@@ -265,7 +266,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     if (tag) Decode(tag->comment(), song->mutable_comment());
   }
 
-  else if (TagLib::WavPack::File *file_wavpack = dynamic_cast<TagLib::WavPack::File *>(fileref->file())) {
+  else if (TagLib::WavPack::File *file_wavpack = dynamic_cast<TagLib::WavPack::File*>(fileref->file())) {
     song->set_bitdepth(file_wavpack->audioProperties()->bitsPerSample());
     if (file_wavpack->APETag()) {
       ParseAPETag(file_wavpack->APETag()->itemListMap(), &disc, &compilation, song);
@@ -306,7 +307,9 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
 
       if (!map["TCMP"].isEmpty()) compilation = TStringToQString(map["TCMP"].front()->toString()).trimmed();
 
-      if (!map["TDOR"].isEmpty()) { song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt()); }
+      if (!map["TDOR"].isEmpty()) {
+        song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt());
+      }
       else if (!map["TORY"].isEmpty()) {
         song->set_originalyear(map["TORY"].front()->toString().substr(0, 4).toInt());
       }
@@ -321,7 +324,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
       if (!map["APIC"].isEmpty()) song->set_art_automatic(kEmbeddedCover);
 
       // Find a suitable comment tag.  For now we ignore iTunNORM comments.
-      for (uint i = 0 ; i < map["COMM"].size() ; ++i) {
+      for (uint i = 0; i < map["COMM"].size(); ++i) {
         const TagLib::ID3v2::CommentsFrame *frame = dynamic_cast<const TagLib::ID3v2::CommentsFrame*>(map["COMM"][i]);
 
         if (frame && TStringToQString(frame->description()) != "iTunNORM") {
@@ -450,7 +453,7 @@ void TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
       }
 
       if (attributes_map.contains("FMPS/Rating")) {
-        const TagLib::ASF::AttributeList& attributes = attributes_map["FMPS/Rating"];
+        const TagLib::ASF::AttributeList &attributes = attributes_map["FMPS/Rating"];
         if (!attributes.isEmpty()) {
           float rating = TStringToQString(attributes.front().toString()).toFloat();
           if (song->rating() <= 0 && rating > 0) {
@@ -679,7 +682,7 @@ bool TagReaderTagLib::SaveFile(const QString &filename, const spb::tagreader::So
   else if (TagLib::MP4::File *file_mp4 = dynamic_cast<TagLib::MP4::File*>(fileref->file())) {
     TagLib::MP4::Tag *tag = file_mp4->tag();
     if (!tag) return false;
-    tag->setItem("disk", TagLib::MP4::Item(song.disc() <= 0 -1 ? 0 : song.disc(), 0));
+    tag->setItem("disk", TagLib::MP4::Item(song.disc() <= 0 - 1 ? 0 : song.disc(), 0));
     tag->setItem("\251wrt", TagLib::StringList(TagLib::String(song.composer(), TagLib::String::UTF8)));
     tag->setItem("\251grp", TagLib::StringList(TagLib::String(song.grouping(), TagLib::String::UTF8)));
     tag->setItem("\251lyr", TagLib::StringList(TagLib::String(song.lyrics(), TagLib::String::UTF8)));
@@ -743,7 +746,7 @@ void TagReaderTagLib::SetTextFrame(const char *id, const std::string &value, Tag
   }
 
   // Update and add the frames
-  for (int i = 0 ; i < frames_buffer.size() ; ++i) {
+  for (int i = 0; i < frames_buffer.size(); ++i) {
     TagLib::ID3v2::TextIdentificationFrame *frame = new TagLib::ID3v2::TextIdentificationFrame(frames_buffer.at(i));
     if (i == 0) {
       frame->setText(StdStringToTaglibString(value));
@@ -799,7 +802,7 @@ void TagReaderTagLib::SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3
   }
 
   // Update and add the frames
-  for (int i = 0 ; i < frames_buffer.size() ; ++i) {
+  for (int i = 0; i < frames_buffer.size(); ++i) {
     TagLib::ID3v2::UnsynchronizedLyricsFrame *frame = new TagLib::ID3v2::UnsynchronizedLyricsFrame(frames_buffer.at(i));
     if (i == 0) {
       frame->setText(StdStringToTaglibString(value));
@@ -983,7 +986,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const QString &filename, const QByteArray
 
     // Remove existing covers
     TagLib::ID3v2::FrameList apiclist = tag->frameListMap()["APIC"];
-    for (TagLib::ID3v2::FrameList::ConstIterator it = apiclist.begin() ; it != apiclist.end() ; ++it ) {
+    for (TagLib::ID3v2::FrameList::ConstIterator it = apiclist.begin(); it != apiclist.end(); ++it) {
       TagLib::ID3v2::AttachedPictureFrame *frame = dynamic_cast<TagLib::ID3v2::AttachedPictureFrame*>(*it);
       tag->removeFrame(frame, false);
     }

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -75,13 +75,13 @@ class TagReaderTagLib : public TagReaderBase {
   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const QString &description, const QString &value, TagLib::ID3v2::Tag *tag) const;
   void SetUserTextFrame(const std::string &description, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-  void SetUnsyncLyricsFrame(const std::string& value, TagLib::ID3v2::Tag* tag) const;
+  void SetUnsyncLyricsFrame(const std::string &value, TagLib::ID3v2::Tag *tag) const;
 
   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
 
   static float ConvertPOPMRating(const int POPM_rating);
   static int ConvertToPOPMRating(const float rating);
-  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag* tag);
+  static TagLib::ID3v2::PopularimeterFrame *GetPOPMFrameFromTag(TagLib::ID3v2::Tag *tag);
 
  private:
   FileRefFactory *factory_;

ext/libstrawberry-tagreader/tagreadertagparser.cpp

@@ -151,7 +151,7 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
 
     const auto tracks = taginfo.tracks();
     for (const auto track : tracks) {
-      switch(track->format().general) {
+      switch (track->format().general) {
         case TagParser::GeneralMediaFormat::Flac:
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_FLAC);
           break;
@@ -174,7 +174,7 @@ void TagReaderTagParser::ReadFile(const QString &filename, spb::tagreader::SongM
           song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_OGGSPEEX);
           break;
         case TagParser::GeneralMediaFormat::Mpeg1Audio:
-          switch(track->format().sub) {
+          switch (track->format().sub) {
             case TagParser::SubFormats::Mpeg1Layer3:
               song->set_filetype(spb::tagreader::SongMetadata_FileType::SongMetadata_FileType_MPEG);
               break;

ext/strawberry-tagreader/main.cpp

@@ -21,7 +21,7 @@
 #include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#include <sys/time.h>
+#  include <sys/time.h>
 #endif
 #include <iostream>
 

src/analyzer/analyzerbase.cpp

@@ -154,7 +154,7 @@ int Analyzer::Base::resizeForBands(const int bands) {
   }
   else {
     exp = 9;
-}
+  }
 
   resizeExponent(exp);
   return fht_->size() / 2;

src/analyzer/analyzercontainer.h

@@ -74,7 +74,7 @@ class AnalyzerContainer : public QWidget {
   void Load();
   void Save();
   void SaveFramerate(const int framerate);
-  template <typename T>
+  template<typename T>
   void AddAnalyzerType();
   void AddFramerate(const QString &name, const int framerate);
 
@@ -96,10 +96,9 @@ class AnalyzerContainer : public QWidget {
 
   Analyzer::Base *current_analyzer_;
   EngineBase *engine_;
-
 };
 
-template <typename T>
+template<typename T>
 void AnalyzerContainer::AddAnalyzerType() {
 
   int id = analyzer_types_.count();

src/analyzer/blockanalyzer.cpp

@@ -64,7 +64,6 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent)
 
   // mxcl says null pixmaps cause crashes, so let's play it safe
   std::fill(fade_bars_.begin(), fade_bars_.end(), QPixmap(1, 1));
-
 }
 
 void BlockAnalyzer::resizeEvent(QResizeEvent *e) {

src/analyzer/rainbowanalyzer.cpp

@@ -43,12 +43,12 @@
 
 using Analyzer::Scope;
 
-const int Rainbow::RainbowAnalyzer::kHeight[] = {21, 33};
+const int Rainbow::RainbowAnalyzer::kHeight[] = { 21, 33 };
-const int Rainbow::RainbowAnalyzer::kWidth[] = {34, 53};
+const int Rainbow::RainbowAnalyzer::kWidth[] = { 34, 53 };
-const int Rainbow::RainbowAnalyzer::kFrameCount[] = {6, 16};
+const int Rainbow::RainbowAnalyzer::kFrameCount[] = { 6, 16 };
-const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = {21, 16};
+const int Rainbow::RainbowAnalyzer::kRainbowHeight[] = { 21, 16 };
-const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = {13, 15};
+const int Rainbow::RainbowAnalyzer::kRainbowOverlap[] = { 13, 15 };
-const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = {24, 33};
+const int Rainbow::RainbowAnalyzer::kSleepingHeight[] = { 24, 33 };
 
 const char *Rainbow::NyanCatAnalyzer::kName = "Nyanalyzer Cat";
 const char *Rainbow::RainbowDashAnalyzer::kName = "Rainbow Dash";

src/analyzer/rainbowanalyzer.h

@@ -93,7 +93,7 @@ class RainbowAnalyzer : public Analyzer::Base {
 
  private:
   // "constants" that get initialized in the constructor
-  float band_scale_[kRainbowBands]{};
+  float band_scale_[kRainbowBands] {};
   QPen colors_[kRainbowBands];
 
   // Rainbow Nyancat & Dash
@@ -104,7 +104,7 @@ class RainbowAnalyzer : public Analyzer::Base {
   int frame_;
 
   // The y positions of each point on the rainbow.
-  float history_[kHistorySize * kRainbowBands]{};
+  float history_[kHistorySize * kRainbowBands] {};
 
   // A cache of the last frame's rainbow,
   // so it can be used in the next frame.
@@ -142,6 +142,6 @@ class RainbowDashAnalyzer : public RainbowAnalyzer {
 
   static const char *kName;
 };
-}
+}  // namespace Rainbow
 
 #endif  // RAINBOWANALYZER_H

src/collection/collectionbackend.cpp

@@ -634,9 +634,7 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) {
         added_songs << new_song;
 
         continue;
-
       }
-
     }
 
     // Create new song
@@ -1345,7 +1343,7 @@ void CollectionBackend::CompilationsNeedUpdating() {
     if (album.isEmpty()) continue;
 
     // Find the directory the song is in
-    QString directory = url.toString(QUrl::PreferLocalFile|QUrl::RemoveFilename);
+    QString directory = url.toString(QUrl::PreferLocalFile | QUrl::RemoveFilename);
 
     CompilationInfo &info = compilation_info[directory + album];
     info.urls << url;

src/collection/collectionfilterwidget.cpp

@@ -84,8 +84,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
     "</span><span style=\"font-style:italic;\">" +
     available_fields +
     QString("</span>.") +
-  QString("</p></body></html>")
+    QString("</p></body></html>"));
-  );
 
   QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
   QObject::connect(filter_delay_, &QTimer::timeout, this, &CollectionFilterWidget::FilterDelayTimeout);
@@ -186,7 +185,6 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
     }
     s.endGroup();
   }
-
 }
 
 void CollectionFilterWidget::ReloadSettings() {

src/collection/collectionitemdelegate.cpp

@@ -100,7 +100,7 @@ void CollectionItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
     // Draw the line under the item
     QColor line_color = opt.palette.color(QPalette::Text);
     QLinearGradient grad_color(opt.rect.bottomLeft(), opt.rect.bottomRight());
-    const double fade_start_end = (opt.rect.width()/3.0)/opt.rect.width();
+    const double fade_start_end = (opt.rect.width() / 3.0) / opt.rect.width();
     line_color.setAlphaF(0.0);
     grad_color.setColorAt(0, line_color);
     line_color.setAlphaF(0.5);

src/context/contextview.cpp

@@ -148,7 +148,7 @@ ContextView::ContextView(QWidget *parent)
   widget_scrollarea_->setLayout(layout_scrollarea_);
   widget_scrollarea_->setContentsMargins(0, 0, 0, 0);
 
-  label_top_->setAlignment(Qt::AlignTop|Qt::AlignLeft);
+  label_top_->setAlignment(Qt::AlignTop | Qt::AlignLeft);
   label_top_->setWordWrap(true);
   label_top_->setMinimumHeight(50);
   label_top_->setContentsMargins(0, 0, 32, 0);

src/core/arraysize.h

@@ -20,14 +20,14 @@
 // This template function declaration is used in defining arraysize.
 // Note that the function doesn't need an implementation, as we only
 // use its type.
-template <typename T, size_t N>
+template<typename T, size_t N>
 char (&ArraySizeHelper(T (&array)[N]))[N];
 
 // That gcc wants both of these prototypes seems mysterious. VC, for
 // its part, can't decide which to use (another mystery). Matching of
 // template overloads: the final frontier.
 #ifndef _MSC_VER
-template <typename T, size_t N>
+template<typename T, size_t N>
 char (&ArraySizeHelper(const T (&array)[N]))[N];
 #endif
 

src/core/lazy.h

@@ -25,7 +25,7 @@
 // Usage:
 //    Lazy<Foo> my_lazy_object([]() { return new Foo; });
 
-template <typename T>
+template<typename T>
 class Lazy {
  public:
   explicit Lazy(std::function<T*()> init) : init_(init) {}

src/core/mainwindow.cpp

@@ -476,9 +476,9 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   QObject::connect(file_view_, &FileView::CopyToCollection, this, &MainWindow::CopyFilesToCollection);
   QObject::connect(file_view_, &FileView::MoveToCollection, this, &MainWindow::MoveFilesToCollection);
   QObject::connect(file_view_, &FileView::EditTags, this, &MainWindow::EditFileTags);
-#ifndef Q_OS_WIN
+#  ifndef Q_OS_WIN
   QObject::connect(file_view_, &FileView::CopyToDevice, this, &MainWindow::CopyFilesToDevice);
-#endif
+#  endif
 #endif
   file_view_->SetTaskManager(app_->task_manager());
 
@@ -536,8 +536,8 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   QObject::connect(app_->scrobbler(), &AudioScrobbler::ErrorMessage, this, &MainWindow::ShowErrorDialog);
 
   // Playlist view actions
-  ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Tab")<< QKeySequence::fromString("Ctrl+PgDown"));
+  ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Tab") << QKeySequence::fromString("Ctrl+PgDown"));
-  ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Shift+Tab")<< QKeySequence::fromString("Ctrl+PgUp"));
+  ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Shift+Tab") << QKeySequence::fromString("Ctrl+PgUp"));
 
   // Actions for switching tabs will be global to the entire window, so adding them here
   addAction(ui_->action_next_playlist);
@@ -680,7 +680,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
   QObject::connect(tidal_view_->albums_collection_view(), &InternetCollectionView::AddToPlaylistSignal, this, &MainWindow::AddToPlaylist);
   QObject::connect(tidal_view_->songs_collection_view(), &InternetCollectionView::AddToPlaylistSignal, this, &MainWindow::AddToPlaylist);
   QObject::connect(tidal_view_->search_view(), &InternetSearchView::AddToPlaylist, this, &MainWindow::AddToPlaylist);
-  if (TidalService *tidalservice = qobject_cast<TidalService*> (app_->internet_services()->ServiceBySource(Song::Source_Tidal))) {
+  if (TidalService *tidalservice = qobject_cast<TidalService*>(app_->internet_services()->ServiceBySource(Song::Source_Tidal))) {
     QObject::connect(this, &MainWindow::AuthorizationUrlReceived, tidalservice, &TidalService::AuthorizationUrlReceived);
   }
 #endif
@@ -1001,11 +1001,11 @@ MainWindow::MainWindow(Application *app, std::shared_ptr<SystemTrayIcon> tray_ic
 
 #ifdef HAVE_QTSPARKLE
   QUrl sparkle_url;
-#if defined(Q_OS_MACOS)
+#  if defined(Q_OS_MACOS)
   sparkle_url.setUrl("https://www.strawberrymusicplayer.org/sparkle-macos");
-#elif defined(Q_OS_WIN)
+#  elif defined(Q_OS_WIN)
   sparkle_url.setUrl("https://www.strawberrymusicplayer.org/sparkle-windows");
-#endif
+#  endif
   if (!sparkle_url.isEmpty()) {
     qLog(Debug) << "Creating Qt Sparkle updater";
     qtsparkle::Updater *updater = new qtsparkle::Updater(sparkle_url, this);
@@ -2274,7 +2274,7 @@ void MainWindow::PlaylistRemoveCurrent() {
 void MainWindow::PlaylistClearCurrent() {
 
   if (app_->playlist_manager()->current()->rowCount() > Playlist::kUndoItemLimit) {
-    QMessageBox messagebox(QMessageBox::Warning, tr("Clear playlist"), tr("Playlist has %1 songs, too large to undo, are you sure you want to clear the playlist?").arg(app_->playlist_manager()->current()->rowCount()), QMessageBox::Ok|QMessageBox::Cancel);
+    QMessageBox messagebox(QMessageBox::Warning, tr("Clear playlist"), tr("Playlist has %1 songs, too large to undo, are you sure you want to clear the playlist?").arg(app_->playlist_manager()->current()->rowCount()), QMessageBox::Ok | QMessageBox::Cancel);
     messagebox.setTextFormat(Qt::RichText);
     int result = messagebox.exec();
     switch (result) {
@@ -2874,22 +2874,20 @@ void MainWindow::Raise() {
   show();
   activateWindow();
   hidden_ = false;
-
 }
 
 #ifdef Q_OS_WIN
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result) {
-#else
+#  else
 bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *result) {
-#endif
+#  endif
 
   if (exit_count_ == 0 && message) {
     MSG *msg = static_cast<MSG*>(message);
     thumbbar_->HandleWinEvent(msg);
   }
   return QMainWindow::nativeEvent(eventType, message, result);
-
 }
 #endif  // Q_OS_WIN
 

src/core/mainwindow.h

@@ -120,11 +120,11 @@ class MainWindow : public QMainWindow, public PlatformInterface {
   void closeEvent(QCloseEvent *e) override;
   void keyPressEvent(QKeyEvent *e) override;
 #ifdef Q_OS_WIN
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
-#else
+#  else
   bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
-#endif
+#  endif
 #endif
 
   // PlatformInterface

src/core/metatypes.cpp

@@ -75,7 +75,7 @@
 #include "radios/radiochannel.h"
 
 #ifdef HAVE_LIBMTP
-  #include "device/mtpconnection.h"
+#  include "device/mtpconnection.h"
 #endif
 
 void RegisterMetaTypes() {

src/core/player.cpp

@@ -113,7 +113,7 @@ Engine::EngineType Player::CreateEngine(Engine::EngineType enginetype) {
   Engine::EngineType use_enginetype(Engine::None);
 
   for (int i = 0; use_enginetype == Engine::None; i++) {
-    switch(enginetype) {
+    switch (enginetype) {
       case Engine::None:
 #ifdef HAVE_GSTREAMER
       case Engine::GStreamer:{
@@ -126,12 +126,14 @@ Engine::EngineType Player::CreateEngine(Engine::EngineType enginetype) {
 #endif
 #ifdef HAVE_VLC
       case Engine::VLC:
-        use_enginetype=Engine::VLC;
+        use_enginetype = Engine::VLC;
         engine_ = std::make_shared<VLCEngine>(app_->task_manager());
         break;
 #endif
       default:
-        if (i > 0) { qFatal("No engine available!"); }
+        if (i > 0) {
+          qFatal("No engine available!");
+        }
         enginetype = Engine::None;
         break;
     }
@@ -167,7 +169,9 @@ void Player::Init() {
     CreateEngine(enginetype);
   }
 
-  if (!engine_->Init()) { qFatal("Error initializing audio engine"); }
+  if (!engine_->Init()) {
+    qFatal("Error initializing audio engine");
+  }
 
   analyzer_->SetEngine(engine_.get());
 

src/core/scoped_cftyperef.h

@@ -17,7 +17,7 @@
 // caller must own the object it gives to ScopedCFTypeRef<>, and relinquishes
 // an ownership claim to that object.  ScopedCFTypeRef<> does not call
 // CFRetain().
-template <typename CFT>
+template<typename CFT>
 class ScopedCFTypeRef {
  public:
   typedef CFT element_type;

src/core/scopedgobject.h

@@ -27,7 +27,7 @@
 
 #include <QtDebug>
 
-template <typename T>
+template<typename T>
 class ScopedGObject {
  public:
   ScopedGObject() : object_(nullptr) {}

src/core/simpletreeitem.h

@@ -30,7 +30,7 @@
 
 #include "simpletreemodel.h"
 
-template <typename T>
+template<typename T>
 class SimpleTreeItem {
  public:
   explicit SimpleTreeItem(int _type, SimpleTreeModel<T> *_model);  // For the root item
@@ -58,13 +58,13 @@ class SimpleTreeItem {
   bool lazy_loaded;
 
   T *parent;
-  QList<T*> children;
+  QList<T *> children;
   QAbstractItemModel *child_model;
 
   SimpleTreeModel<T> *model;
 };
 
-template <typename T>
+template<typename T>
 SimpleTreeItem<T>::SimpleTreeItem(int _type, SimpleTreeModel<T> *_model)
     : type(_type),
       row(0),
@@ -73,7 +73,7 @@ SimpleTreeItem<T>::SimpleTreeItem(int _type, SimpleTreeModel<T> *_model)
       child_model(nullptr),
       model(_model) {}
 
-template <typename T>
+template<typename T>
 SimpleTreeItem<T>::SimpleTreeItem(int _type, const QString &_key, T *_parent)
     : type(_type),
       key(_key),
@@ -87,7 +87,7 @@ SimpleTreeItem<T>::SimpleTreeItem(int _type, const QString &_key, T *_parent)
   }
 }
 
-template <typename T>
+template<typename T>
 SimpleTreeItem<T>::SimpleTreeItem(int _type, T *_parent)
     : type(_type),
       lazy_loaded(false),
@@ -100,7 +100,7 @@ SimpleTreeItem<T>::SimpleTreeItem(int _type, T *_parent)
   }
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeItem<T>::InsertNotify(T *_parent) {
   parent = _parent;
   model = parent->model;
@@ -111,7 +111,7 @@ void SimpleTreeItem<T>::InsertNotify(T *_parent) {
   model->EndInsert();
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeItem<T>::DeleteNotify(int child_row) {
   model->BeginDelete(static_cast<T*>(this), child_row);
   delete children.takeAt(child_row);
@@ -121,7 +121,7 @@ void SimpleTreeItem<T>::DeleteNotify(int child_row) {
   model->EndDelete();
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeItem<T>::ClearNotify() {
   if (children.count()) {
     model->BeginDelete(static_cast<T*>(this), 0, children.count() - 1);
@@ -133,17 +133,17 @@ void SimpleTreeItem<T>::ClearNotify() {
   }
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeItem<T>::ChangedNotify() {
   model->EmitDataChanged(static_cast<T*>(this));
 }
 
-template <typename T>
+template<typename T>
 SimpleTreeItem<T>::~SimpleTreeItem() {
   qDeleteAll(children);
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeItem<T>::Delete(int child_row) {
   delete children.takeAt(child_row);
 
@@ -151,7 +151,7 @@ void SimpleTreeItem<T>::Delete(int child_row) {
   for (int i = child_row; i < children.count(); ++i) children[i]->row--;
 }
 
-template <typename T>
+template<typename T>
 T *SimpleTreeItem<T>::ChildByKey(const QString &_key) const {
   for (T *child : children) {
     if (child->key == _key) return child;

src/core/simpletreemodel.h

@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QAbstractItemModel>
 
-template <typename T>
+template<typename T>
 class SimpleTreeModel : public QAbstractItemModel {
  public:
   explicit SimpleTreeModel(T *root = nullptr, QObject *parent = nullptr);
@@ -59,17 +59,17 @@ class SimpleTreeModel : public QAbstractItemModel {
   T *root_;
 };
 
-template <typename T>
+template<typename T>
 SimpleTreeModel<T>::SimpleTreeModel(T *root, QObject *parent)
     : QAbstractItemModel(parent), root_(root) {}
 
-template <typename T>
+template<typename T>
 T *SimpleTreeModel<T>::IndexToItem(const QModelIndex &idx) const {
   if (!idx.isValid()) return root_;
   return reinterpret_cast<T*>(idx.internalPointer());
 }
 
-template <typename T>
+template<typename T>
 QModelIndex SimpleTreeModel<T>::ItemToIndex(T *item) const {
   if (!item || !item->parent) return QModelIndex();
   return createIndex(item->row, 0, item);
@@ -80,7 +80,7 @@ int SimpleTreeModel<T>::columnCount(const QModelIndex&) const {
   return 1;
 }
 
-template <typename T>
+template<typename T>
 QModelIndex SimpleTreeModel<T>::index(int row, int, const QModelIndex &parent) const {
 
   T *parent_item = IndexToItem(parent);
@@ -88,21 +88,20 @@ QModelIndex SimpleTreeModel<T>::index(int row, int, const QModelIndex &parent) c
     return QModelIndex();
 
   return ItemToIndex(parent_item->children[row]);
-
 }
 
-template <typename T>
+template<typename T>
 QModelIndex SimpleTreeModel<T>::parent(const QModelIndex &idx) const {
   return ItemToIndex(IndexToItem(idx)->parent);
 }
 
-template <typename T>
+template<typename T>
 int SimpleTreeModel<T>::rowCount(const QModelIndex &parent) const {
   T *item = IndexToItem(parent);
   return item->children.count();
 }
 
-template <typename T>
+template<typename T>
 bool SimpleTreeModel<T>::hasChildren(const QModelIndex &parent) const {
   T *item = IndexToItem(parent);
   if (item->lazy_loaded)
@@ -111,13 +110,13 @@ bool SimpleTreeModel<T>::hasChildren(const QModelIndex &parent) const {
     return true;
 }
 
-template <typename T>
+template<typename T>
 bool SimpleTreeModel<T>::canFetchMore(const QModelIndex &parent) const {
   T *item = IndexToItem(parent);
   return !item->lazy_loaded;
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::fetchMore(const QModelIndex &parent) {
   T *item = IndexToItem(parent);
   if (!item->lazy_loaded) {
@@ -125,29 +124,29 @@ void SimpleTreeModel<T>::fetchMore(const QModelIndex &parent) {
   }
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::BeginInsert(T *parent, int start, int end) {
   if (end == -1) end = start;
   beginInsertRows(ItemToIndex(parent), start, end);
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::EndInsert() {
   endInsertRows();
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::BeginDelete(T *parent, int start, int end) {
   if (end == -1) end = start;
   beginRemoveRows(ItemToIndex(parent), start, end);
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::EndDelete() {
   endRemoveRows();
 }
 
-template <typename T>
+template<typename T>
 void SimpleTreeModel<T>::EmitDataChanged(T *item) {
   QModelIndex index(ItemToIndex(item));
   emit dataChanged(index, index);

src/core/stylehelper.cpp

@@ -367,7 +367,7 @@ QPixmap StyleHelper::disabledSideBarIcon(const QPixmap &enabledicon) {
 
   for (int y = 0; y < im.height(); ++y) {
     auto scanLine = reinterpret_cast<QRgb*>(im.scanLine(y));
-    for (int x=0; x<im.width(); ++x) {
+    for (int x = 0; x < im.width(); ++x) {
       QRgb pixel = *scanLine;
       char intensity = static_cast<char>(qGray(pixel));
       *scanLine = qRgba(intensity, intensity, intensity, qAlpha(pixel));
@@ -391,7 +391,7 @@ void StyleHelper::drawCornerImage(const QImage &img, QPainter *painter, const QR
 
   const QSize size = img.size();
   if (top > 0) {  //top
-    painter->drawImage(QRectF(rect.left() + left, rect.top(), rect.width() -right - left, top), img, QRectF(leftDIP, 0, size.width() - rightDIP - leftDIP, topDIP));
+    painter->drawImage(QRectF(rect.left() + left, rect.top(), rect.width() - right - left, top), img, QRectF(leftDIP, 0, size.width() - rightDIP - leftDIP, topDIP));
     if (left > 0) {  //top-left
       painter->drawImage(QRectF(rect.left(), rect.top(), left, top), img, QRectF(0, 0, leftDIP, topDIP));
     }
@@ -401,15 +401,15 @@ void StyleHelper::drawCornerImage(const QImage &img, QPainter *painter, const QR
   }
   //left
   if (left > 0) {
-    painter->drawImage(QRectF(rect.left(), rect.top()+top, left, rect.height() - top - bottom), img, QRectF(0, topDIP, leftDIP, size.height() - bottomDIP - topDIP));
+    painter->drawImage(QRectF(rect.left(), rect.top() + top, left, rect.height() - top - bottom), img, QRectF(0, topDIP, leftDIP, size.height() - bottomDIP - topDIP));
   }
   //center
-  painter->drawImage(QRectF(rect.left() + left, rect.top()+top, rect.width() -right - left, rect.height() - bottom - top), img, QRectF(leftDIP, topDIP, size.width() - rightDIP - leftDIP, size.height() - bottomDIP - topDIP));
+  painter->drawImage(QRectF(rect.left() + left, rect.top() + top, rect.width() - right - left, rect.height() - bottom - top), img, QRectF(leftDIP, topDIP, size.width() - rightDIP - leftDIP, size.height() - bottomDIP - topDIP));
   if (right > 0) {  //right
-    painter->drawImage(QRectF(rect.left() +rect.width() - right, rect.top()+top, right, rect.height() - top - bottom), img, QRectF(size.width() - rightDIP, topDIP, rightDIP, size.height() - bottomDIP - topDIP));
+    painter->drawImage(QRectF(rect.left() + rect.width() - right, rect.top() + top, right, rect.height() - top - bottom), img, QRectF(size.width() - rightDIP, topDIP, rightDIP, size.height() - bottomDIP - topDIP));
   }
   if (bottom > 0) {  //bottom
-    painter->drawImage(QRectF(rect.left() +left, rect.top() + rect.height() - bottom, rect.width() - right - left, bottom), img, QRectF(leftDIP, size.height() - bottomDIP, size.width() - rightDIP - leftDIP, bottomDIP));
+    painter->drawImage(QRectF(rect.left() + left, rect.top() + rect.height() - bottom, rect.width() - right - left, bottom), img, QRectF(leftDIP, size.height() - bottomDIP, size.width() - rightDIP - leftDIP, bottomDIP));
     if (left > 0) {  //bottom-left
       painter->drawImage(QRectF(rect.left(), rect.top() + rect.height() - bottom, left, bottom), img, QRectF(0, size.height() - bottomDIP, leftDIP, bottomDIP));
     }
@@ -417,7 +417,6 @@ void StyleHelper::drawCornerImage(const QImage &img, QPainter *painter, const QR
       painter->drawImage(QRectF(rect.left() + rect.width() - right, rect.top() + rect.height() - bottom, right, bottom), img, QRectF(size.width() - rightDIP, size.height() - bottomDIP, rightDIP, bottomDIP));
     }
   }
-
 }
 
 // Tints an image with tintColor, while preserving alpha and lightness
@@ -485,7 +484,6 @@ QList<int> StyleHelper::availableImageResolutions(const QString &fileName) {
     }
   }
   return result;
-
 }
 
 }  // namespace Utils

src/core/stylehelper.h

@@ -41,9 +41,8 @@ QT_END_NAMESPACE
 // Helper class holding all custom color values
 
 namespace Utils {
-class StyleHelper
+class StyleHelper {
-{
+ public:
-public:
   static const unsigned int DEFAULT_BASE_COLOR = 0x666666;
   static const int progressFadeAnimationDuration = 600;
 
@@ -93,7 +92,7 @@ public:
   static QString imageFileWithResolution(const QString &fileName, int dpr);
   static QList<int> availableImageResolutions(const QString &fileName);
 
-private:
+ private:
   static QColor m_baseColor;
   static QColor m_requestedBaseColor;
   static QColor m_IconsBaseColor;

src/core/tagreaderclient.h

@@ -37,7 +37,7 @@
 
 class QThread;
 class Song;
-template <typename HandlerType> class WorkerPool;
+template<typename HandlerType> class WorkerPool;
 
 class TagReaderClient : public QObject {
   Q_OBJECT
@@ -58,8 +58,8 @@ class TagReaderClient : public QObject {
   ReplyType *IsMediaFile(const QString &filename);
   ReplyType *LoadEmbeddedArt(const QString &filename);
   ReplyType *SaveEmbeddedArt(const QString &filename, const QByteArray &data);
-  ReplyType* UpdateSongPlaycount(const Song &metadata);
+  ReplyType *UpdateSongPlaycount(const Song &metadata);
-  ReplyType* UpdateSongRating(const Song &metadata);
+  ReplyType *UpdateSongRating(const Song &metadata);
 
   // Convenience functions that call the above functions and wait for a response.
   // These block the calling thread with a semaphore, and must NOT be called from the TagReaderClient's thread.

src/core/utilities.cpp

@@ -376,11 +376,11 @@ void OpenInFileManager(const QString &path, const QUrl &url) {
       QString cmd = setting.value("Exec").toString();
       if (cmd.isEmpty()) break;
       cmd = cmd.remove(QRegularExpression("[%][a-zA-Z]*( |$)", QRegularExpression::CaseInsensitiveOption));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
       command_params = cmd.split(' ', Qt::SkipEmptyParts);
-#else
+#  else
       command_params = cmd.split(' ', QString::SkipEmptyParts);
-#endif
+#  endif
       command = command_params.first();
       command_params.removeFirst();
     }
@@ -800,9 +800,9 @@ QString UnicodeToAscii(QString unicode) {
 
 #else
 
-#ifdef LC_ALL
+#  ifdef LC_ALL
   setlocale(LC_ALL, "");
-#endif
+#  endif
 
   iconv_t conv = iconv_open("ASCII//TRANSLIT", "UTF-8");
   if (conv == reinterpret_cast<iconv_t>(-1)) return unicode;
@@ -831,7 +831,6 @@ QString UnicodeToAscii(QString unicode) {
   return ret;
 
 #endif  // _MSC_VER
-
 }
 
 QString MacAddress() {
@@ -988,9 +987,9 @@ HRGN qt_RectToHRGN(const QRect &rc) {
 HRGN toHRGN(const QRegion &region);
 HRGN toHRGN(const QRegion &region) {
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   return region.toHRGN();
-#else
+#  else
 
   const int rect_count = region.rectCount();
   if (rect_count == 0) {
@@ -1009,13 +1008,12 @@ HRGN toHRGN(const QRegion &region) {
 
   return resultRgn;
 
-#endif  // Qt 6
+#  endif  // Qt 6
-
 }
 
 void enableBlurBehindWindow(QWindow *window, const QRegion &region) {
 
-  DWM_BLURBEHIND dwmbb = {0, 0, nullptr, 0};
+  DWM_BLURBEHIND dwmbb = { 0, 0, nullptr, 0 };
   dwmbb.dwFlags = DWM_BB_ENABLE;
   dwmbb.fEnable = TRUE;
   HRGN rgn = nullptr;

src/core/utilities.h

@@ -115,11 +115,11 @@ enum IoPriority {
   IOPRIO_CLASS_BE,
   IOPRIO_CLASS_IDLE,
 };
-  enum {
+enum {
   IOPRIO_WHO_PROCESS = 1,
   IOPRIO_WHO_PGRP,
   IOPRIO_WHO_USER,
-  };
+};
 static const int IOPRIO_CLASS_SHIFT = 13;
 
 long SetThreadIOPriority(const IoPriority priority);
@@ -157,10 +157,10 @@ class ScopedWCharArray {
   QString ToString() const { return QString::fromWCharArray(data_.get()); }
 
   wchar_t *get() const { return data_.get(); }
-  explicit operator wchar_t*() const { return get(); }
+  explicit operator wchar_t *() const { return get(); }
 
   qint64 characters() const { return chars_; }
-  qint64 bytes() const { return (chars_ + 1)  *sizeof(wchar_t); }
+  qint64 bytes() const { return (chars_ + 1) * sizeof(wchar_t); }
 
  private:
   Q_DISABLE_COPY(ScopedWCharArray)

src/core/windows7thumbbar.cpp

@@ -30,7 +30,7 @@
 #include <QtDebug>
 
 #ifndef _WIN32_WINNT
-  #define _WIN32_WINNT 0x0600
+#  define _WIN32_WINNT 0x0600
 #endif
 
 #include <windows.h>
@@ -77,24 +77,23 @@ ITaskbarList3 *Windows7ThumbBar::CreateTaskbarList() {
   ITaskbarList3 *taskbar_list = nullptr;
 
   // Copied from win7 SDK shobjidl.h
-  static const GUID CLSID_ITaskbarList = { 0x56FDF344,0xFD6D,0x11d0,{0x95,0x8A,0x00,0x60,0x97,0xC9,0xA0,0x90}};
+  static const GUID CLSID_ITaskbarList = { 0x56FDF344, 0xFD6D, 0x11d0, { 0x95, 0x8A, 0x00, 0x60, 0x97, 0xC9, 0xA0, 0x90 } };
 
   // Create the taskbar list
   HRESULT hr = CoCreateInstance(CLSID_ITaskbarList, nullptr, CLSCTX_ALL, IID_ITaskbarList3, reinterpret_cast<void**>(&taskbar_list));
   if (hr != S_OK) {
-    qLog(Warning) << "Error creating the ITaskbarList3 interface" << Qt::hex << DWORD (hr);
+    qLog(Warning) << "Error creating the ITaskbarList3 interface" << Qt::hex << DWORD(hr);
     return nullptr;
   }
 
   hr = taskbar_list->HrInit();
   if (hr != S_OK) {
-    qLog(Warning) << "Error initializing taskbar list" << Qt::hex << DWORD (hr);
+    qLog(Warning) << "Error initializing taskbar list" << Qt::hex << DWORD(hr);
     taskbar_list->Release();
     return nullptr;
   }
 
   return taskbar_list;
-
 }
 
 void Windows7ThumbBar::SetupButton(const QAction *action, THUMBBUTTON *button) {
@@ -145,7 +144,7 @@ void Windows7ThumbBar::HandleWinEvent(MSG *msg) {
     qLog(Debug) << "Adding" << actions_.count() << "buttons";
     HRESULT hr = taskbar_list->ThumbBarAddButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
     if (hr != S_OK) {
-      qLog(Debug) << "Failed to add buttons" << Qt::hex << DWORD (hr);
+      qLog(Debug) << "Failed to add buttons" << Qt::hex << DWORD(hr);
     }
 
     for (int i = 0; i < actions_.count(); ++i) {
@@ -188,12 +187,11 @@ void Windows7ThumbBar::ActionChanged() {
 
     button->iId = i;
     SetupButton(action, button);
-
   }
 
   HRESULT hr = taskbar_list->ThumbBarUpdateButtons(reinterpret_cast<HWND>(widget_->winId()), actions_.count(), buttons);
   if (hr != S_OK) {
-    qLog(Debug) << "Failed to update buttons" << Qt::hex << DWORD (hr);
+    qLog(Debug) << "Failed to update buttons" << Qt::hex << DWORD(hr);
   }
 
   for (int i = 0; i < actions_.count(); ++i) {

src/covermanager/albumcoverchoicecontroller.cpp

@@ -211,7 +211,7 @@ QUrl AlbumCoverChoiceController::LoadCoverFromFile(Song *song) {
 
   if (QImage(cover_file).isNull()) return QUrl();
 
-  switch(get_save_album_cover_type()) {
+  switch (get_save_album_cover_type()) {
     case CollectionSettingsPage::SaveCoverType_Embedded:
       if (song->save_embedded_cover_supported()) {
         SaveCoverEmbeddedAutomatic(*song, cover_file);

src/covermanager/coversearchstatistics.cpp

@@ -33,7 +33,7 @@ CoverSearchStatistics::CoverSearchStatistics()
       chosen_width_(0),
       chosen_height_(0) {}
 
-CoverSearchStatistics &CoverSearchStatistics::operator +=(const CoverSearchStatistics &other) {
+CoverSearchStatistics &CoverSearchStatistics::operator+=(const CoverSearchStatistics &other) {
 
   network_requests_made_ += other.network_requests_made_;
   bytes_transferred_ += other.bytes_transferred_;

src/covermanager/coversearchstatistics.h

@@ -32,7 +32,7 @@ struct CoverSearchStatistics {
 
   explicit CoverSearchStatistics();
 
-  CoverSearchStatistics &operator +=(const CoverSearchStatistics &other);
+  CoverSearchStatistics &operator+=(const CoverSearchStatistics &other);
 
   quint64 network_requests_made_;
   quint64 bytes_transferred_;

src/covermanager/discogscoverprovider.cpp

@@ -383,7 +383,7 @@ void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int se
       continue;
     }
     QJsonObject obj_artist = value_artist.toObject();
-    if (!obj_artist.contains("name") ) {
+    if (!obj_artist.contains("name")) {
       Error("Invalid Json reply, artists array value object is missing name.", obj_artist);
       continue;
     }

src/covermanager/spotifycoverprovider.cpp

@@ -111,7 +111,10 @@ void SpotifyCoverProvider::Authenticate() {
     bool success = false;
     forever {
       server_->set_port(port);
-      if (server_->Listen()) { success = true; break; }
+      if (server_->Listen()) {
+        success = true;
+        break;
+      }
       ++port;
       if (port > port_max) break;
     }

src/covermanager/tidalcoverprovider.h

@@ -50,7 +50,9 @@ class TidalCoverProvider : public JsonCoverProvider {
   void CancelSearch(const int id) override;
 
   bool IsAuthenticated() const override { return service_ && service_->authenticated(); }
-  void Deauthenticate() override { if (service_) service_->Logout(); }
+  void Deauthenticate() override {
+    if (service_) service_->Logout();
+  }
 
  private slots:
   void HandleSearchReply(QNetworkReply *reply, const int id);

src/device/devicemanager.h

@@ -141,7 +141,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
 
  private:
   void AddLister(DeviceLister *lister);
-  template <typename T> void AddDeviceClass();
+  template<typename T> void AddDeviceClass();
 
   DeviceDatabaseBackend::Device InfoToDatabaseDevice(const DeviceInfo &info) const;
 
@@ -173,7 +173,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
 
 };
 
-template <typename T>
+template<typename T>
 void DeviceManager::AddDeviceClass() {
   QStringList schemes = T::url_schemes();
   QMetaObject obj = T::staticMetaObject;

src/device/giolister.cpp

@@ -70,10 +70,9 @@ bool GioLister::DeviceInfo::is_suitable() const {
   if (filesystem_type.isEmpty()) return true;
 
   return filesystem_type != "udf" && filesystem_type != "smb" && filesystem_type != "cifs" && filesystem_type != "ssh" && filesystem_type != "isofs";
-
 }
 
-template <typename T, typename F>
+template<typename T, typename F>
 void OperationFinished(F f, GObject *object, GAsyncResult *result) {
 
   T *obj = reinterpret_cast<T*>(object);

src/device/giolister.h

@@ -137,7 +137,7 @@ class GioLister : public DeviceLister {
   QString FindUniqueIdByMount(GMount *mount) const;
   QString FindUniqueIdByVolume(GVolume *volume) const;
 
-  template <typename T>
+  template<typename T>
   T LockAndGetDeviceInfo(const QString &id, T DeviceInfo::*field);
 
  private:
@@ -148,7 +148,7 @@ class GioLister : public DeviceLister {
   QMap<QString, DeviceInfo> devices_;
 };
 
-template <typename T>
+template<typename T>
 T GioLister::LockAndGetDeviceInfo(const QString &id, T DeviceInfo::*field) {
   QMutexLocker l(&mutex_);
   if (!devices_.contains(id)) return T();

src/device/macosdevicelister.h

@@ -84,12 +84,12 @@ class MacOsDeviceLister : public DeviceLister {
  private:
   bool Init();
 
-  static void DiskAddedCallback(DADiskRef disk, void* context);
+  static void DiskAddedCallback(DADiskRef disk, void *context);
-  static void DiskRemovedCallback(DADiskRef disk, void* context);
+  static void DiskRemovedCallback(DADiskRef disk, void *context);
   static void USBDeviceAddedCallback(void *refcon, io_iterator_t it);
   static void USBDeviceRemovedCallback(void *refcon, io_iterator_t it);
 
-  static void DiskUnmountCallback(DADiskRef disk, DADissenterRef dissenter, void* context);
+  static void DiskUnmountCallback(DADiskRef disk, DADissenterRef dissenter, void *context);
 
   void FoundMTPDevice(const MTPDevice &device, const QString &serial);
   void RemovedMTPDevice(const QString &serial);

src/dialogs/console.cpp

@@ -44,7 +44,7 @@ Console::Console(Application *app, QWidget *parent) : QDialog(parent), ui_{}, ap
 
   ui_.setupUi(this);
 
-  setWindowFlags(windowFlags()|Qt::WindowMaximizeButtonHint);
+  setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);
 
   QObject::connect(ui_.run, &QPushButton::clicked, this, &Console::RunQuery);
 

src/engine/alsadevicefinder.cpp

@@ -34,7 +34,7 @@
 #include "devicefinder.h"
 #include "alsadevicefinder.h"
 
-AlsaDeviceFinder::AlsaDeviceFinder() : DeviceFinder("alsa", { "alsa","alsasink" }) {}
+AlsaDeviceFinder::AlsaDeviceFinder() : DeviceFinder("alsa", { "alsa", "alsasink" }) {}
 
 QList<DeviceFinder::Device> AlsaDeviceFinder::ListDevices() {
 

src/engine/alsapcmdevicefinder.cpp

@@ -33,7 +33,7 @@
 #include "devicefinder.h"
 #include "alsapcmdevicefinder.h"
 
-AlsaPCMDeviceFinder::AlsaPCMDeviceFinder() : DeviceFinder("alsa", { "alsa","alsasink" }) {}
+AlsaPCMDeviceFinder::AlsaPCMDeviceFinder() : DeviceFinder("alsa", { "alsa", "alsasink" }) {}
 
 QList<DeviceFinder::Device> AlsaPCMDeviceFinder::ListDevices() {
 

src/engine/enginebase.cpp

@@ -94,19 +94,17 @@ bool Engine::Base::Play(const QUrl &stream_url, const QUrl &original_url, const
   }
 
   return Play(offset_nanosec);
-
 }
 
 void Engine::Base::SetVolume(const uint value) {
 
   volume_ = value;
   SetVolumeSW(MakeVolumeLogarithmic(value));
-
 }
 
 uint Engine::Base::MakeVolumeLogarithmic(const uint volume) {
   // We're using a logarithmic function to make the volume ramp more natural.
-  return static_cast<uint>( 100 - 100.0 * std::log10( ( 100 - volume ) * 0.09 + 1.0 ) );
+  return static_cast<uint>(100 - 100.0 * std::log10((100 - volume) * 0.09 + 1.0));
 }
 
 void Engine::Base::ReloadSettings() {

src/engine/gstenginepipeline.cpp

@@ -894,7 +894,7 @@ GstPadProbeReturn GstEnginePipeline::HandoffCallback(GstPad *pad, GstPadProbeInf
     int16_t *s16 = static_cast<int16_t*>(g_malloc(buf16_size));
     memset(s16, 0, buf16_size);
     for (int i = 0; i < (samples * channels); ++i) {
-      s16[i] = *(reinterpret_cast<int16_t*>(s24+1));
+      s16[i] = *(reinterpret_cast<int16_t*>(s24 + 1));
       s24 += 3;
       if (s24 >= s24e) break;
     }
@@ -919,7 +919,7 @@ GstPadProbeReturn GstEnginePipeline::HandoffCallback(GstPad *pad, GstPadProbeInf
     memset(s16, 0, buf16_size);
     for (int i = 0; i < (samples * channels); ++i) {
       char *s24 = reinterpret_cast<char*>(s32p);
-      s16[i] = *(reinterpret_cast<int16_t*>(s24+1));
+      s16[i] = *(reinterpret_cast<int16_t*>(s24 + 1));
       ++s32p;
       if (s32p > s32e) break;
     }

src/engine/gststartup.cpp

@@ -120,17 +120,17 @@ void GstStartup::SetEnvironment() {
   QString gst_registry_filename;
 
 #ifdef USE_BUNDLE
-#if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)
+#  if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)
   gio_module_path = bundle_path + "/gio-modules";
-#endif
+#  endif
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
+#  if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
   gst_plugin_scanner = bundle_path + "/gst-plugin-scanner";
   gst_plugin_path = bundle_path + "/gstreamer";
-#endif
+#  endif
-#if defined(Q_OS_WIN32)
+#  if defined(Q_OS_WIN32)
   //gst_plugin_scanner = bundle_path + "/gst-plugin-scanner.exe";
   gst_plugin_path = bundle_path + "/gstreamer-plugins";
-#endif
+#  endif
 #endif
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)

src/engine/macosdevicefinder.cpp

@@ -34,7 +34,7 @@
 
 namespace {
 
-template <typename T>
+template<typename T>
 std::unique_ptr<T> GetProperty(const AudioDeviceID &device_id, const AudioObjectPropertyAddress &address, UInt32 *size_bytes_out = nullptr) {
 
   UInt32 size_bytes = 0;

src/engine/pulsedevicefinder.cpp

@@ -34,7 +34,7 @@
 #include "devicefinder.h"
 #include "pulsedevicefinder.h"
 
-PulseDeviceFinder::PulseDeviceFinder() : DeviceFinder( "pulseaudio", { "pulseaudio", "pulse", "pulsesink" }), mainloop_(nullptr), context_(nullptr) {}
+PulseDeviceFinder::PulseDeviceFinder() : DeviceFinder("pulseaudio", { "pulseaudio", "pulse", "pulsesink" }), mainloop_(nullptr), context_(nullptr) {}
 
 bool PulseDeviceFinder::Initialize() {
 

src/engine/vlcscopedref.h

@@ -25,14 +25,14 @@
 
 #include <vlc/vlc.h>
 
-template <typename T>
+template<typename T>
 class VlcScopedRef {
  public:
   explicit VlcScopedRef(T *ptr);
   ~VlcScopedRef();
 
-  operator T*() const { return ptr_; }
+  operator T *() const { return ptr_; }
-  operator bool () const { return ptr_; }
+  operator bool() const { return ptr_; }
   T *operator->() const { return ptr_; }
 
  private:
@@ -49,21 +49,21 @@ class VlcScopedRef {
     }
 #define VLCSCOPEDREF_DEFINE(type) VLCSCOPEDREF_DEFINE2(type, libvlc_##type##_release)
 
-template <typename T>
+template<typename T>
 void VlcScopedRef_Release(T *ptr);
 
 VLCSCOPEDREF_DEFINE2(instance, libvlc_release)
 VLCSCOPEDREF_DEFINE(media_player)
 VLCSCOPEDREF_DEFINE(media)
 
-template <> void VlcScopedRef_Release<char>(char *ptr) { free(ptr); }
+template<> void VlcScopedRef_Release<char>(char *ptr) { free(ptr); }
 
-template <typename T>
+template<typename T>
 VlcScopedRef<T>::VlcScopedRef(T *ptr)
     : ptr_(ptr) {
 }
 
-template <typename T>
+template<typename T>
 VlcScopedRef<T>::~VlcScopedRef() {
   VlcScopedRef_Release(ptr_);
 }

src/equalizer/equalizer.cpp

@@ -384,11 +384,10 @@ bool Equalizer::Params::operator==(const Equalizer::Params &other) const {
     if (gain[i] != other.gain[i]) return false;
   }
   return true;
-
 }
 
 bool Equalizer::Params::operator!=(const Equalizer::Params &other) const {
-  return ! (*this == other);
+  return !(*this == other);
 }
 
 QDataStream &operator<<(QDataStream &s, const Equalizer::Params &p) {

src/equalizer/equalizer.h

@@ -56,7 +56,7 @@ class Equalizer : public QDialog {
     bool operator!=(const Params &other) const;
 
     int preamp;
-    int gain[kBands]{};
+    int gain[kBands] {};
   };
 
   bool is_equalizer_enabled() const;
@@ -100,7 +100,7 @@ class Equalizer : public QDialog {
   QString last_preset_;
 
   EqualizerSlider *preamp_;
-  EqualizerSlider *gain_[kBands]{};
+  EqualizerSlider *gain_[kBands] {};
 
   QMap<QString, Params> presets_;
 };

src/globalshortcuts/globalshortcut-x11.cpp

@@ -39,11 +39,11 @@
 #include <xcb/xproto.h>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
-#if defined(HAVE_X11EXTRAS)
+#  if defined(HAVE_X11EXTRAS)
 #    include <QX11Info>
-#elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+#  elif defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
 #    include <qpa/qplatformnativeinterface.h>
-#endif
+#  endif
 #endif
 
 const QVector<quint32> GlobalShortcut::mask_modifiers_ = QVector<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);

src/globalshortcuts/globalshortcutsbackend.cpp

@@ -33,7 +33,7 @@ GlobalShortcutsBackend::GlobalShortcutsBackend(GlobalShortcutsManager *manager,
 
 QString GlobalShortcutsBackend::name() const {
 
-  switch(type_) {
+  switch (type_) {
     case Type_None:
       return "None";
     case Type_KDE:

src/globalshortcuts/globalshortcutsmanager.cpp

@@ -170,29 +170,25 @@ GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(const QStri
 bool GlobalShortcutsManager::IsKdeAvailable() {
 
   return GlobalShortcutsBackendKDE::IsKDEAvailable();
-
 }
 
 bool GlobalShortcutsManager::IsGnomeAvailable() {
 
   return GlobalShortcutsBackendGnome::IsGnomeAvailable();
-
 }
 
 bool GlobalShortcutsManager::IsMateAvailable() {
 
   return GlobalShortcutsBackendMate::IsMateAvailable();
-
 }
 
-#  endif  // defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && defined(HAVE_DBUS)
+#endif  // defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && defined(HAVE_DBUS)
 
 #ifdef HAVE_X11_GLOBALSHORTCUTS
 
 bool GlobalShortcutsManager::IsX11Available() {
 
   return GlobalShortcutsBackendX11::IsX11Available();
-
 }
 
 #endif  // HAVE_X11_GLOBALSHORTCUTS

src/internet/internetcollectionview.cpp

@@ -390,7 +390,7 @@ void InternetCollectionView::AddToPlaylistEnqueueNext() {
 void InternetCollectionView::OpenInNewPlaylist() {
 
   QMimeData *q_mimedata = model()->mimeData(selectedIndexes());
-  if (MimeData* mimedata = qobject_cast<MimeData*>(q_mimedata)) {
+  if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
     mimedata->open_in_new_playlist_ = true;
   }
   emit AddToPlaylistSignal(q_mimedata);

src/main.cpp

@@ -39,11 +39,11 @@
 #endif
 
 #ifdef Q_OS_WIN32
-  #ifndef _WIN32_WINNT
+#  ifndef _WIN32_WINNT
-    #define _WIN32_WINNT 0x0600
+#    define _WIN32_WINNT 0x0600
-  #endif
+#  endif
-  #include <windows.h>
+#  include <windows.h>
-  #include <iostream>
+#  include <iostream>
 #endif  // Q_OS_WIN32
 
 #include <QObject>
@@ -265,19 +265,19 @@ int main(int argc, char *argv[]) {
 
   std::unique_ptr<Translations> translations(new Translations);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   translations->LoadTranslation("qt", QLibraryInfo::path(QLibraryInfo::TranslationsPath), language);
-#else
+#  else
   translations->LoadTranslation("qt", QLibraryInfo::location(QLibraryInfo::TranslationsPath), language);
-#endif
+#  endif
   translations->LoadTranslation("strawberry", ":/translations", language);
   translations->LoadTranslation("strawberry", TRANSLATIONS_DIR, language);
   translations->LoadTranslation("strawberry", QCoreApplication::applicationDirPath(), language);
   translations->LoadTranslation("strawberry", QDir::currentPath(), language);
 
-#ifdef HAVE_QTSPARKLE
+#  ifdef HAVE_QTSPARKLE
   //qtsparkle::LoadTranslations(language);
-#endif
+#  endif
 
 #endif
 

src/organize/organizedialog.cpp

@@ -88,7 +88,7 @@ OrganizeDialog::OrganizeDialog(TaskManager *task_manager, CollectionBackend *bac
 
   ui_->setupUi(this);
 
-  setWindowFlags(windowFlags()|Qt::WindowMaximizeButtonHint);
+  setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);
 
   QPushButton *button_save = ui_->button_box->addButton("Save settings", QDialogButtonBox::ApplyRole);
   QObject::connect(button_save, &QPushButton::clicked, this, &OrganizeDialog::SaveSettings);

src/osd/osdpretty.cpp

@@ -108,9 +108,9 @@ OSDPretty::OSDPretty(Mode mode, QWidget *parent)
 
 #ifdef Q_OS_WIN
   // Don't show the window in the taskbar.  Qt::ToolTip does this too, but it adds an extra ugly shadow.
-  int ex_style = GetWindowLong((HWND) winId(), GWL_EXSTYLE);
+  int ex_style = GetWindowLong((HWND)winId(), GWL_EXSTYLE);
   ex_style |= WS_EX_NOACTIVATE;
-  SetWindowLong((HWND) winId(), GWL_EXSTYLE, ex_style);
+  SetWindowLong((HWND)winId(), GWL_EXSTYLE, ex_style);
 #endif
 
   // Mode settings
@@ -166,7 +166,7 @@ OSDPretty::~OSDPretty() {
 void OSDPretty::showEvent(QShowEvent *e) {
 
   screens_.clear();
-  for(QScreen *screen : QGuiApplication::screens()) {
+  for (QScreen *screen : QGuiApplication::screens()) {
     screens_.insert(screen->name(), screen);
   }
 
@@ -310,10 +310,10 @@ void OSDPretty::paintEvent(QPaintEvent*) {
   p.drawPixmap(0, height() - kShadowCornerSize, shadow_corner_[3]);
 
   // Shadow edges
-  p.drawTiledPixmap(kShadowCornerSize, 0, width() - kShadowCornerSize*2, kDropShadowSize, shadow_edge_[0]);
+  p.drawTiledPixmap(kShadowCornerSize, 0, width() - kShadowCornerSize * 2, kDropShadowSize, shadow_edge_[0]);
-  p.drawTiledPixmap(width() - kDropShadowSize, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize*2, shadow_edge_[1]);
+  p.drawTiledPixmap(width() - kDropShadowSize, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize * 2, shadow_edge_[1]);
-  p.drawTiledPixmap(kShadowCornerSize, height() - kDropShadowSize, width() - kShadowCornerSize*2, kDropShadowSize, shadow_edge_[2]);
+  p.drawTiledPixmap(kShadowCornerSize, height() - kDropShadowSize, width() - kShadowCornerSize * 2, kDropShadowSize, shadow_edge_[2]);
-  p.drawTiledPixmap(0, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize*2, shadow_edge_[3]);
+  p.drawTiledPixmap(0, kShadowCornerSize, kDropShadowSize, height() - kShadowCornerSize * 2, shadow_edge_[3]);
 
   // Box background
   p.setBrush(background_color_);

src/playlist/playlist.cpp

@@ -177,7 +177,7 @@ Playlist::~Playlist() {
   collection_items_by_id_.clear();
 }
 
-template <typename T>
+template<typename T>
 void Playlist::InsertSongItems(const SongList &songs, const int pos, const bool play_now, const bool enqueue, const bool enqueue_next) {
 
   PlaylistItemList items;
@@ -2168,13 +2168,12 @@ void Playlist::RemoveDeletedSongs() {
   }
 
   removeRows(rows_to_remove);
-
 }
 
 namespace {
 
 struct SongSimilarHash {
-  size_t operator() (const Song &song) const {
+  size_t operator()(const Song &song) const {
     return HashSimilar(song);
   }
 };

src/playlist/playlist.h

@@ -357,7 +357,7 @@ class Playlist : public QAbstractListModel {
   int PreviousVirtualIndex(int i, const bool ignore_repeat_track) const;
   bool FilterContainsVirtualIndex(const int i) const;
 
-  template <typename T>
+  template<typename T>
   void InsertSongItems(const SongList &songs, const int pos, const bool play_now, const bool enqueue, const bool enqueue_next = false);
 
   // Modify the playlist without changing the undo stack.  These are used by our friends in PlaylistUndoCommands

src/playlist/playlisttabbar.cpp

@@ -428,7 +428,7 @@ void PlaylistTabBar::dropEvent(QDropEvent *e) {
 
   if (drag_hover_tab_ == -1) {
     const MimeData *mime_data = qobject_cast<const MimeData*>(e->mimeData());
-    if(mime_data && !mime_data->name_for_new_playlist_.isEmpty()) {
+    if (mime_data && !mime_data->name_for_new_playlist_.isEmpty()) {
       manager_->New(mime_data->name_for_new_playlist_);
     }
     else {

src/playlistparsers/wplparser.h

@@ -53,7 +53,7 @@ class WplParser : public XMLParser {
   SongList Load(QIODevice *device, const QString &playlist_path, const QDir &dir, const bool collection_search = true) const override;
   void Save(const SongList &songs, QIODevice *device, const QDir &dir, Playlist::Path path_type = Playlist::Path_Automatic) const override;
 
-private:
+ private:
   void ParseSeq(const QDir &dir, QXmlStreamReader *reader, SongList *songs, const bool collection_search = true) const;
   static void WriteMeta(const QString &name, const QString &content, QXmlStreamWriter *writer);
 };

src/qobuz/qobuzrequest.cpp

@@ -707,7 +707,7 @@ void QobuzRequest::AlbumsFinishCheck(const QString &artist_id, const int limit,
 
     // Get songs for all the albums.
 
-    QHash<QString, Request> ::iterator it;
+    QHash<QString, Request>::iterator it;
     for (it = album_songs_requests_pending_.begin(); it != album_songs_requests_pending_.end(); ++it) {
       Request request = it.value();
       AddAlbumSongsRequest(request.artist_id, request.album_id, request.album_artist, request.album);

src/qobuz/qobuzservice.cpp

@@ -716,14 +716,12 @@ void QobuzService::SendSearch() {
 
   search_request_->Search(search_id_, search_text_);
   search_request_->Process();
-
 }
 
 void QobuzService::SearchResultsReceived(const int id, const SongMap &songs, const QString &error) {
 
   search_request_.reset();
   emit SearchResults(id, songs, error);
-
 }
 
 uint QobuzService::GetStreamURL(const QUrl &url, QString &error) {

src/radios/radioservices.h

@@ -46,7 +46,7 @@ class RadioServices : public QObject {
 
   RadioService *ServiceBySource(const Song::Source source) const;
 
-  template <typename T>
+  template<typename T>
   T *Service() {
     return static_cast<T*>(ServiceBySource(T::source));
   }

src/scrobbler/audioscrobbler.h

@@ -57,7 +57,7 @@ class AudioScrobbler : public QObject {
 
   ScrobblerService *ServiceByName(const QString &name) const { return scrobbler_services_->ServiceByName(name); }
 
-  template <typename T>
+  template<typename T>
   T *Service() {
     return qobject_cast<T*>(ServiceByName(T::kName));
   }

src/scrobbler/scrobblerservices.h

@@ -46,7 +46,7 @@ class ScrobblerServices : public QObject {
   int NextId();
 
   ScrobblerService *ServiceByName(const QString &name);
-  template <typename T>
+  template<typename T>
   T *Service() {
     return qobject_cast<T*>(ServiceByName(T::kName));
   }

src/scrobbler/scrobblingapi20.cpp

@@ -169,7 +169,7 @@ void ScrobblingAPI20::Authenticate(const bool https) {
   messagebox.setTextFormat(Qt::RichText);
   int result = messagebox.exec();
   switch (result) {
-  case QMessageBox::Open:{
+    case QMessageBox::Open: {
       bool openurl_result = QDesktopServices::openUrl(url);
       if (openurl_result) {
         break;
@@ -193,7 +193,6 @@ void ScrobblingAPI20::Authenticate(const bool https) {
     default:
       break;
   }
-
 }
 
 void ScrobblingAPI20::RedirectArrived() {
@@ -533,12 +532,13 @@ void ScrobblingAPI20::Scrobble(const Song &song) {
   if (app_->scrobbler()->IsOffline()) return;
 
   if (!IsAuthenticated()) {
-    if (app_->scrobbler()->ShowErrorDialog()) { emit ErrorMessage(tr("Scrobbler %1 is not authenticated!").arg(name_)); }
+    if (app_->scrobbler()->ShowErrorDialog()) {
+      emit ErrorMessage(tr("Scrobbler %1 is not authenticated!").arg(name_));
+    }
     return;
   }
 
   StartSubmit(true);
-
 }
 
 void ScrobblingAPI20::StartSubmit(const bool initial) {
@@ -1016,8 +1016,9 @@ void ScrobblingAPI20::Error(const QString &error, const QVariant &debug) {
   qLog(Error) << name_ << error;
   if (debug.isValid()) qLog(Debug) << debug;
 
-  if (app_->scrobbler()->ShowErrorDialog()) { emit ErrorMessage(tr("Scrobbler %1 error: %2").arg(name_, error)); }
+  if (app_->scrobbler()->ShowErrorDialog()) {
-
+    emit ErrorMessage(tr("Scrobbler %1 error: %2").arg(name_, error));
+  }
 }
 
 QString ScrobblingAPI20::ErrorString(const ScrobbleErrorCode error) {

src/settings/collectionsettingspage.cpp

@@ -76,11 +76,11 @@ CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog, QWidget *
   setWindowIcon(IconLoader::Load("library-music"));
   ui_->add->setIcon(IconLoader::Load("document-open-folder"));
 
-  ui_->combobox_cache_size->addItems({"KB", "MB"});
+  ui_->combobox_cache_size->addItems({ "KB", "MB" });
-  ui_->combobox_disk_cache_size->addItems({"KB", "MB", "GB"});
+  ui_->combobox_disk_cache_size->addItems({ "KB", "MB", "GB" });
 
-  ui_->combobox_iopriority->addItems({"Auto", "Realtime", "Best effort", "Idle"});
+  ui_->combobox_iopriority->addItems({ "Auto", "Realtime", "Best effort", "Idle" });
-  ui_->combobox_threadpriority->addItems({"Idle", "Lowest", "Low", "Normal"});
+  ui_->combobox_threadpriority->addItems({ "Idle", "Lowest", "Low", "Normal" });
 
   QObject::connect(ui_->add, &QPushButton::clicked, this, &CollectionSettingsPage::Add);
   QObject::connect(ui_->remove, &QPushButton::clicked, this, &CollectionSettingsPage::Remove);

src/settings/contextsettingspage.h

@@ -71,7 +71,7 @@ class ContextSettingsPage : public SettingsPage {
 
  private:
   Ui_ContextSettingsPage *ui_;
-  QCheckBox *checkboxes_[ContextSettingsOrder::NELEMS]{};
+  QCheckBox *checkboxes_[ContextSettingsOrder::NELEMS] {};
 };
 
 #endif  // CONTEXTSETTINGSPAGE_H

src/settings/notificationssettingspage.cpp

@@ -185,8 +185,8 @@ void NotificationsSettingsPage::Load() {
       break;
   }
   ui_->notifications_duration->setValue(s.value("Timeout", 5000).toInt() / 1000);
-  ui_->notifications_volume->setChecked( s.value("ShowOnVolumeChange", false).toBool());
+  ui_->notifications_volume->setChecked(s.value("ShowOnVolumeChange", false).toBool());
-  ui_->notifications_play_mode->setChecked( s.value("ShowOnPlayModeChange", true).toBool());
+  ui_->notifications_play_mode->setChecked(s.value("ShowOnPlayModeChange", true).toBool());
   ui_->notifications_pause->setChecked(s.value("ShowOnPausePlayback", true).toBool());
   ui_->notifications_resume->setChecked(s.value("ShowOnResumePlayback", false).toBool());
   ui_->notifications_art->setChecked(s.value("ShowArt", true).toBool());

src/settings/subsonicsettingspage.cpp

@@ -85,7 +85,7 @@ void SubsonicSettingsPage::Load() {
   ui_->checkbox_server_scrobbling->setChecked(s.value("serversidescrobbling", false).toBool());
 
   AuthMethod auth_method = static_cast<AuthMethod>(s.value("authmethod", AuthMethod_MD5).toInt());
-  switch(auth_method) {
+  switch (auth_method) {
     case AuthMethod_Hex:
       ui_->auth_method_hex->setChecked(true);
       break;

src/smartplaylists/smartplaylistsviewcontainer.cpp

@@ -247,7 +247,6 @@ void SmartPlaylistsViewContainer::DeleteSmartPlaylistFromButton() {
   if (ui_->view->selectionModel()->selectedIndexes().count() == 0) return;
 
   DeleteSmartPlaylist(ui_->view->selectionModel()->selectedIndexes().first());
-
 }
 
 void SmartPlaylistsViewContainer::NewSmartPlaylistFinished() {
@@ -256,7 +255,6 @@ void SmartPlaylistsViewContainer::NewSmartPlaylistFinished() {
   if (!wizard) return;
   QObject::disconnect(wizard, &SmartPlaylistWizard::accepted, this, &SmartPlaylistsViewContainer::NewSmartPlaylistFinished);
   model_->AddGenerator(wizard->CreateGenerator());
-
 }
 
 void SmartPlaylistsViewContainer::EditSmartPlaylistFinished() {

src/transcoder/transcodedialog.cpp

@@ -92,7 +92,7 @@ TranscodeDialog::TranscodeDialog(QMainWindow *mainwindow, QWidget *parent)
 
   ui_->setupUi(this);
 
-  setWindowFlags(windowFlags()|Qt::WindowMaximizeButtonHint);
+  setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);
 
   ui_->files->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 

src/widgets/busyindicator.cpp

@@ -38,7 +38,6 @@ BusyIndicator::BusyIndicator(const QString &text, QWidget *parent)
       label_(nullptr) {
 
   Init(text);
-
 }
 
 BusyIndicator::BusyIndicator(QWidget *parent)
@@ -47,7 +46,6 @@ BusyIndicator::BusyIndicator(QWidget *parent)
       label_(nullptr) {
 
   Init(QString());
-
 }
 
 void BusyIndicator::Init(const QString &text) {

src/widgets/clickablelabel.cpp

@@ -22,7 +22,7 @@
 #include <QWidget>
 #include <QLabel>
 
-ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent){}
+ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent) {}
 
 void ClickableLabel::mousePressEvent(QMouseEvent *event) {
   emit Clicked();

src/widgets/fancytabwidget.cpp

@@ -219,7 +219,7 @@ class FancyTabBar : public QTabBar {  // clazy:exclude=missing-qobject-macro
     if (tabWidget->mode() != FancyTabWidget::Mode_LargeSidebar && tabWidget->mode() != FancyTabWidget::Mode_SmallSidebar) {
       // Cache and hide label text for IconOnlyTabs mode
       if (tabWidget->mode() == FancyTabWidget::Mode_IconOnlyTabs && labelCache.count() == 0) {
-        for(int i = 0; i < count(); ++i) {
+        for (int i = 0; i < count(); ++i) {
           labelCache[tabWidget->widget(i)] = tabText(i);
           setTabToolTip(i, tabText(i));
           setTabText(i, "");
@@ -315,7 +315,7 @@ class FancyTabBar : public QTabBar {  // clazy:exclude=missing-qobject-macro
         p.setFont(boldFont);
 
         // Text drop shadow color
-        p.setPen(selected ? QColor(255, 255, 255, 160) : QColor(0, 0, 0, 110) );
+        p.setPen(selected ? QColor(255, 255, 255, 160) : QColor(0, 0, 0, 110));
         p.translate(0, 3);
         p.drawText(tabrectText, textFlags, tabText(index));
 
@@ -338,7 +338,7 @@ class FancyTabBar : public QTabBar {  // clazy:exclude=missing-qobject-macro
           tabrectIcon = tabrectLabel;
           tabrectIcon.setSize(QSize(tabWidget->iconsize_largesidebar(), tabWidget->iconsize_largesidebar()));
           // Center the icon
-          const int moveRight = (QTabBar::width() - tabWidget->iconsize_largesidebar() -1) / 2;
+          const int moveRight = (QTabBar::width() - tabWidget->iconsize_largesidebar() - 1) / 2;
           tabrectIcon.translate(moveRight, 5);
         }
         tabIcon(index).paint(&p, tabrectIcon, iconFlags);
@@ -346,7 +346,6 @@ class FancyTabBar : public QTabBar {  // clazy:exclude=missing-qobject-macro
       }
     }
   }
-
 };
 
 class TabData : public QObject {  // clazy:exclude=missing-qobject-macro

src/widgets/freespacebar.cpp

@@ -212,7 +212,7 @@ void FreeSpaceBar::DrawText(QPainter *p, const QRect r) {
   for (const Label &label : labels) {
     const bool light = palette().color(QPalette::Base).value() > 128;
 
-    QRect box(x, r.top() + (r.height() - kLabelBoxSize)/2, kLabelBoxSize, kLabelBoxSize);
+    QRect box(x, r.top() + (r.height() - kLabelBoxSize) / 2, kLabelBoxSize, kLabelBoxSize);
     p->setPen(label.color.darker());
     p->setBrush(label.color);
     p->drawRect(box);

src/widgets/groupediconview.h

@@ -70,7 +70,7 @@ class GroupedIconView : public QListView {
   int header_spacing() const { return header_spacing_; }
   int header_indent() const { return header_indent_; }
   int item_indent() const { return item_indent_; }
-  const QString &header_text() const { return header_text_;}
+  const QString &header_text() const { return header_text_; }
 
   void set_header_spacing(const int value) { header_spacing_ = value; }
   void set_header_indent(const int value) { header_indent_ = value; }

src/widgets/lineedit.cpp

@@ -203,7 +203,6 @@ TextEdit::TextEdit(QWidget *parent)
 
   QObject::connect(reset_button_, &QToolButton::clicked, this, &TextEdit::Reset);
   QObject::connect(this, &TextEdit::textChanged, [this]() { viewport()->update(); });  // To clear the hint
-
 }
 
 void TextEdit::paintEvent(QPaintEvent *e) {
@@ -222,7 +221,6 @@ SpinBox::SpinBox(QWidget *parent)
       ExtendedEditor(this, 14, false) {
 
   QObject::connect(reset_button_, &QToolButton::clicked, this, &SpinBox::Reset);
-
 }
 
 void SpinBox::paintEvent(QPaintEvent *e) {
@@ -239,7 +237,6 @@ CheckBox::CheckBox(QWidget *parent)
     : QCheckBox(parent), ExtendedEditor(this, 14, false) {
 
   QObject::connect(reset_button_, &QToolButton::clicked, this, &CheckBox::Reset);
-
 }
 
 void CheckBox::paintEvent(QPaintEvent *e) {
@@ -258,7 +255,6 @@ QString SpinBox::textFromValue(int val) const {
     return "-";
   }
   return QSpinBox::textFromValue(val);
-
 }
 
 RatingBox::RatingBox(QWidget *parent)
@@ -267,5 +263,4 @@ RatingBox::RatingBox(QWidget *parent)
 
   clear_button_->hide();
   reset_button_->hide();
-
 }

src/widgets/playingwidget.cpp

@@ -318,7 +318,9 @@ void PlayingWidget::SetImage(const QImage &image) {
     DrawContents(&p);
     p.end();
   }
-  else { pixmap_previous_track_ = QPixmap(); }
+  else {
+    pixmap_previous_track_ = QPixmap();
+  }
 
   image_original_ = image;
   UpdateDetailsText();

src/widgets/ratingwidget.cpp

@@ -80,10 +80,9 @@ QRect RatingPainter::Contents(const QRect rect) {
   const int x = rect.x() + (rect.width() - width) / 2;
 
   return QRect(x, rect.y(), width, rect.height());
-
 }
 
- float RatingPainter::RatingForPos(const QPoint pos, const QRect rect) {
+float RatingPainter::RatingForPos(const QPoint pos, const QRect rect) {
 
   const QRect contents = Contents(rect);
   const float raw = static_cast<float>(pos.x() - contents.left()) / static_cast<float>(contents.width());

src/widgets/volumeslider.cpp

@@ -380,7 +380,7 @@ void VolumeSlider::paletteChange(const QPalette&) {
   generateGradient();
 }
 
-QPixmap VolumeSlider::drawVolumePixmap () const {
+QPixmap VolumeSlider::drawVolumePixmap() const {
 
   QPixmap pixmap(112, 36);
   pixmap.fill(Qt::transparent);