From 5b92408fee1e66f67d8419636fde461c077f2be0 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Tue, 16 Apr 2024 11:46:02 +0300
Subject: [PATCH] Fix conflict with macros on Windows.

---
 src/libs/vganalytics/vganalytics.cpp       |  3 +--
 src/libs/vganalytics/vganalyticsworker.cpp | 12 ++++++------
 src/libs/vganalytics/vganalyticsworker.h   |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/libs/vganalytics/vganalytics.cpp b/src/libs/vganalytics/vganalytics.cpp
index 23417fe4f..3c746f4c7 100644
--- a/src/libs/vganalytics/vganalytics.cpp
+++ b/src/libs/vganalytics/vganalytics.cpp
@@ -298,8 +298,7 @@ void VGAnalytics::SendAppCloseEvent(qint64 engagementTimeMsec)
     };
 
     SendEvent(QStringLiteral("vapp_close"), params);
-    QNetworkReply *reply = d->PostMessage();
-    if (reply)
+    if (QNetworkReply *reply = d->SendAnalytics())
     {
         QTimer timer;
         const int timeoutSeconds = 3; // Wait for 3 seconds
diff --git a/src/libs/vganalytics/vganalyticsworker.cpp b/src/libs/vganalytics/vganalyticsworker.cpp
index e50f6c9f8..b0c8dde63 100644
--- a/src/libs/vganalytics/vganalyticsworker.cpp
+++ b/src/libs/vganalytics/vganalyticsworker.cpp
@@ -78,7 +78,7 @@ VGAnalyticsWorker::VGAnalyticsWorker(QObject *parent)
     m_screenScaleFactor = screen->logicalDotsPerInchX() / 96.0;
 
     m_timer.setInterval(m_timerInterval);
-    connect(&m_timer, &QTimer::timeout, this, &VGAnalyticsWorker::PostMessage);
+    connect(&m_timer, &QTimer::timeout, this, &VGAnalyticsWorker::SendAnalytics);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ void VGAnalyticsWorker::EnqueQueryWithCurrentTime(const QJsonObject &query)
  * The message POST is asyncroniously when the server
  * answered a signal will be emitted.
  */
-auto VGAnalyticsWorker::PostMessage() -> QNetworkReply *
+auto VGAnalyticsWorker::SendAnalytics() -> QNetworkReply *
 {
     if (m_messageQueue.isEmpty())
     {
@@ -229,7 +229,7 @@ auto VGAnalyticsWorker::PostMessage() -> QNetworkReply *
     {
         // too old.
         m_messageQueue.dequeue();
-        return PostMessage();
+        return SendAnalytics();
     }
 
     QByteArray const requestJson = QJsonDocument(buffer.postQuery).toJson(QJsonDocument::Compact);
@@ -258,7 +258,7 @@ auto VGAnalyticsWorker::PostMessage() -> QNetworkReply *
     }
 
     QNetworkReply *reply = networkManager->post(m_request, requestJson);
-    connect(reply, &QNetworkReply::finished, this, &VGAnalyticsWorker::PostMessageFinished);
+    connect(reply, &QNetworkReply::finished, this, &VGAnalyticsWorker::SendAnalyticsFinished);
     return reply;
 }
 
@@ -272,7 +272,7 @@ auto VGAnalyticsWorker::PostMessage() -> QNetworkReply *
  * If message couldn't be send then next try is when the
  * timer emits its signal.
  */
-void VGAnalyticsWorker::PostMessageFinished()
+void VGAnalyticsWorker::SendAnalyticsFinished()
 {
     auto *reply = qobject_cast<QNetworkReply *>(sender());
 
@@ -289,6 +289,6 @@ void VGAnalyticsWorker::PostMessageFinished()
     LogMessage(VGAnalytics::Debug, QStringLiteral("Message sent"));
 
     m_messageQueue.dequeue();
-    PostMessage();
+    SendAnalytics();
     reply->deleteLater();
 }
diff --git a/src/libs/vganalytics/vganalyticsworker.h b/src/libs/vganalytics/vganalyticsworker.h
index 19b844ec2..b73b752e4 100644
--- a/src/libs/vganalytics/vganalyticsworker.h
+++ b/src/libs/vganalytics/vganalyticsworker.h
@@ -91,8 +91,8 @@ public:
     void Enable(bool state);
 
 public slots:
-    QNetworkReply *PostMessage(); // NOLINT(modernize-use-trailing-return-type)
-    void PostMessageFinished();
+    QNetworkReply *SendAnalytics(); // NOLINT(modernize-use-trailing-return-type)
+    void SendAnalyticsFinished();
 
 private:
     Q_DISABLE_COPY_MOVE(VGAnalyticsWorker) // NOLINT