From a68c249d4e36a7bf35231f3af4a65fe21017f34c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 15 Jun 2020 00:33:47 +0200
Subject: [PATCH] Use parentheses for macro arguments

---
 3rdparty/taglib/toolkit/trefcounter.cpp        | 8 ++++----
 3rdparty/taglib/toolkit/tstring.h              | 6 +++---
 ext/libstrawberry-common/core/messagehandler.h | 4 ++--
 src/core/song.cpp                              | 6 +++---
 src/musicbrainz/musicbrainzclient.h            | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/3rdparty/taglib/toolkit/trefcounter.cpp b/3rdparty/taglib/toolkit/trefcounter.cpp
index 226575639..5f3c4fd79 100644
--- a/3rdparty/taglib/toolkit/trefcounter.cpp
+++ b/3rdparty/taglib/toolkit/trefcounter.cpp
@@ -32,8 +32,8 @@
 #if defined(HAVE_STD_ATOMIC)
 #  include <atomic>
 #  define ATOMIC_INT    std::atomic_int
-#  define ATOMIC_INC(x) (++x)
-#  define ATOMIC_DEC(x) (--x)
+#  define ATOMIC_INC(x) (++(x))
+#  define ATOMIC_DEC(x) (--(x))
 #elif defined(HAVE_GCC_ATOMIC)
 #  define ATOMIC_INT    int
 #  define ATOMIC_INC(x) __sync_add_and_fetch(&x, 1)
@@ -58,8 +58,8 @@
 #  define ATOMIC_DEC(x) __sync_sub_and_fetch(&x, 1)
 #else
 #  define ATOMIC_INT    int
-#  define ATOMIC_INC(x) (++x)
-#  define ATOMIC_DEC(x) (--x)
+#  define ATOMIC_INC(x) (++(x))
+#  define ATOMIC_DEC(x) (--(x))
 #endif
 
 namespace Strawberry_TagLib {
diff --git a/3rdparty/taglib/toolkit/tstring.h b/3rdparty/taglib/toolkit/tstring.h
index c8de8b315..ba456464c 100644
--- a/3rdparty/taglib/toolkit/tstring.h
+++ b/3rdparty/taglib/toolkit/tstring.h
@@ -43,9 +43,9 @@
  */
 
 #if defined(QT_VERSION) && (QT_VERSION >= 0x040000)
-#  define QStringToTString(s) Strawberry_TagLib::TagLib::String(s.toUtf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
+#  define QStringToTString(s) Strawberry_TagLib::TagLib::String((s).toUtf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
 #else
-#  define QStringToTString(s) Strawberry_TagLib::TagLib::String(s.utf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
+#  define QStringToTString(s) Strawberry_TagLib::TagLib::String((s).utf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
 #endif
 
 /*!
@@ -58,7 +58,7 @@
  *
  */
 
-#define TStringToQString(s) QString::fromUtf8(s.toCString(true))
+#define TStringToQString(s) QString::fromUtf8((s).toCString(true))
 
 namespace Strawberry_TagLib {
 namespace TagLib {
diff --git a/ext/libstrawberry-common/core/messagehandler.h b/ext/libstrawberry-common/core/messagehandler.h
index 04896d0ac..dbf78efdc 100644
--- a/ext/libstrawberry-common/core/messagehandler.h
+++ b/ext/libstrawberry-common/core/messagehandler.h
@@ -34,8 +34,8 @@
 
 class QIODevice;
 
-#define QStringFromStdString(x) QString::fromUtf8(x.data(), x.size())
-#define DataCommaSizeFromQString(x) x.toUtf8().constData(), x.toUtf8().length()
+#define QStringFromStdString(x) QString::fromUtf8((x).data(), (x).size())
+#define DataCommaSizeFromQString(x) (x).toUtf8().constData(), (x).toUtf8().length()
 
 // Reads and writes uint32 length encoded protobufs to a socket.
 // This base QObject is separate from AbstractMessageHandler because moc can't handle templated classes.
diff --git a/src/core/song.cpp b/src/core/song.cpp
index c91061e36..a09675f17 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -1273,9 +1273,9 @@ bool Song::MergeFromSimpleMetaBundle(const Engine::SimpleMetaBundle &bundle) {
 
 void Song::BindToQuery(QSqlQuery *query) const {
 
-#define strval(x) (x.isNull() ? "" : x)
-#define intval(x) (x <= 0 ? -1 : x)
-#define notnullintval(x) (x == -1 ? QVariant() : x)
+#define strval(x) ((x).isNull() ? "" : (x))
+#define intval(x) ((x) <= 0 ? -1 : (x))
+#define notnullintval(x) ((x) == -1 ? QVariant() : (x))
 
   // Remember to bind these in the same order as kBindSpec
 
diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h
index 25efa3e42..1a83fa7bc 100644
--- a/src/musicbrainz/musicbrainzclient.h
+++ b/src/musicbrainz/musicbrainzclient.h
@@ -58,8 +58,8 @@ class MusicBrainzClient : public QObject {
 
     bool operator<(const Result& other) const {
 #define cmp(field)                      \
-  if (field < other.field) return true; \
-  if (field > other.field) return false;
+  if ((field) < other.field) return true; \
+  if ((field) > other.field) return false;
 
       cmp(track_);
       cmp(year_);