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,15 +158,15 @@ 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),
-    next_id_(0) {
+    : _WorkerPoolBase(parent),
+      next_worker_(0),
+      next_id_(0) {
 
   worker_count_ = qBound(1, QThread::idealThreadCount() / 2, 4);
   local_server_name_ = qApp->applicationName().toLower();
@@ -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)
 };
@@ -130,11 +131,11 @@ TagLib::String QStringToTaglibString(const QString &s) {
 }  // namespace
 
 namespace {
-const char *kMP4_OriginalYear_ID =   "----:com.apple.iTunes:ORIGINAL YEAR";
+const char *kMP4_OriginalYear_ID = "----:com.apple.iTunes:ORIGINAL YEAR";
 const char *kMP4_FMPS_Playcount_ID = "----:com.apple.iTunes:FMPS_Playcount";
-const char *kMP4_FMPS_Rating_ID =    "----:com.apple.iTunes:FMPS_Rating";
-const char *kASF_OriginalDate_ID =   "WM/OriginalReleaseTime";
-const char *kASF_OriginalYear_ID =   "WM/OriginalReleaseYear";
+const char *kMP4_FMPS_Rating_ID = "----:com.apple.iTunes:FMPS_Rating";
+const char *kASF_OriginalDate_ID = "WM/OriginalReleaseTime";
+const char *kASF_OriginalYear_ID = "WM/OriginalReleaseYear";
 }  // namespace
 
 
@@ -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/macdeploycheck/macdeploycheck.cpp

@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
       QRegularExpressionMatch match = regexp.match(output_line);
       if (match.hasMatch()) {
         QString library = match.captured(1);
-        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) { // It's this.
+        if (QFileInfo(library).fileName() == QFileInfo(filepath).fileName()) {  // It's this.
           continue;
         }
         else if (library.startsWith("@executable_path")) {
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
         else if (library.startsWith("@rpath")) {
           QString real_path = library;
           real_path = real_path.replace("@rpath", bundle_path + "/Contents/Frameworks");
-          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) { // FIXME: Ignore broken svg image plugin.
+          if (!QFile(real_path).exists() && !real_path.endsWith("QtSvg")) {  // FIXME: Ignore broken svg image plugin.
             qLog(Error) << real_path << "does not exist for" << filepath;
             success = false;
           }
@@ -127,7 +127,7 @@ int main(int argc, char **argv) {
             success = false;
           }
         }
-        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) { // System library
+        else if (library.startsWith("/System/Library/") || library.startsWith("/usr/lib/")) {  // System library
           continue;
         }
         else if (library.endsWith("libgcc_s.1.dylib")) {  // fftw points to it for some reason.

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>
 

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -28,7 +28,7 @@
 #include "tagreaderworker.h"
 
 TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
+    : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
 
 void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {