Extract utility functions for QUuid

CMakeLists.txt

@@ -1560,7 +1560,6 @@ add_executable(mixxx-test
   src/test/colorconfig_test.cpp
   src/test/colormapperjsproxy_test.cpp
   src/test/colorpalette_test.cpp
-  src/test/compatibility_test.cpp
   src/test/configobject_test.cpp
   src/test/controller_mapping_validation_test.cpp
   src/test/controllerscriptenginelegacy_test.cpp
@@ -1639,6 +1638,7 @@ add_executable(mixxx-test
   src/test/tracknumberstest.cpp
   src/test/trackreftest.cpp
   src/test/trackupdate_test.cpp
+  src/test/uuid_test.cpp
   src/test/wbatterytest.cpp
   src/test/wpushbutton_test.cpp
   src/test/wwidgetstack_test.cpp

src/library/basetracktablemodel.cpp

@@ -64,7 +64,7 @@ const QStringList kDefaultTableColumns = {
 inline QSqlDatabase cloneDatabase(
         const QSqlDatabase& prototype) {
     const auto connectionName =
-            uuidToStringWithoutBraces(QUuid::createUuid());
+            QUuid::createUuid().toString(QUuid::WithoutBraces);
     auto cloned = QSqlDatabase::cloneDatabase(
             prototype,
             connectionName);

src/musicbrainz/web/musicbrainzrecordingstask.cpp

@@ -9,7 +9,6 @@
 #include "musicbrainz/musicbrainzxml.h"
 #include "network/httpstatuscode.h"
 #include "util/assert.h"
-#include "util/compatibility.h"
 #include "util/logger.h"
 #include "util/thread_affinity.h"
 #include "util/versionstore.h"
@@ -50,7 +49,7 @@ QNetworkRequest createNetworkRequest(
     DEBUG_ASSERT(kBaseUrl.isValid());
     DEBUG_ASSERT(!recordingId.isNull());
     QUrl url = kBaseUrl;
-    url.setPath(kRequestPath + uuidToStringWithoutBraces(recordingId));
+    url.setPath(kRequestPath + recordingId.toString(QUuid::WithoutBraces));
     url.setQuery(createUrlQuery());
     DEBUG_ASSERT(url.isValid());
     QNetworkRequest networkRequest(url);

src/test/uuid_test.cpp

@@ -0,0 +1,20 @@
+#include <gtest/gtest.h>
+
+#include "util/quuid.h"
+
+class UuidTest : public testing::Test {
+};
+
+TEST_F(UuidTest, uuidToNullableStringWithoutBracesNullTest) {
+    EXPECT_STREQ(
+            qPrintable(QString{}),
+            qPrintable(uuidToNullableStringWithoutBraces(QUuid{})));
+}
+
+TEST_F(UuidTest, uuidToNullableStringWithoutBracesValidTest) {
+    const auto validUuid = QUuid::createUuid();
+    ASSERT_FALSE(validUuid.isNull());
+    EXPECT_STREQ(
+            qPrintable(validUuid.toString(QUuid::WithoutBraces)),
+            qPrintable(uuidToNullableStringWithoutBraces(validUuid)));
+}

src/track/taglib/trackmetadata_common.h

@@ -9,8 +9,7 @@
 #include <QString>
 
 #if defined(__EXTRA_METADATA__)
-// UUID -> QString
-#include "util/compatibility.h"
+#include "util/quuid.h"
 #endif // __EXTRA_METADATA__
 
 #include "track/trackmetadata.h"

src/util/compatibility.h

@@ -5,7 +5,6 @@
 #include <QCoreApplication>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QUuid>
 #include <QWidget>
 #include <QtDebug>
 
@@ -24,17 +23,3 @@ inline QScreen* getPrimaryScreen() {
     }
     return app->primaryScreen();
 }
-
-inline
-QString uuidToStringWithoutBraces(const QUuid& uuid) {
-    return uuid.toString(QUuid::WithoutBraces);
-}
-
-inline
-QString uuidToNullableStringWithoutBraces(const QUuid& uuid) {
-    if (uuid.isNull()) {
-        return QString();
-    } else {
-        return uuidToStringWithoutBraces(uuid);
-    }
-}

src/util/quuid.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <QString>
+#include <QUuid>
+
+///
+/// Utility functions for QUuid
+///
+
+/// Format a UUID without enclosing curly braces, representing a null UUID
+/// by an empty string instead of 00000000-0000-0000-0000-000000000000.
+inline QString uuidToNullableStringWithoutBraces(const QUuid& uuid) {
+    if (uuid.isNull()) {
+        return QString{};
+    } else {
+        return uuid.toString(QUuid::WithoutBraces);
+    }
+}

src/widget/wtrackmenu.cpp

@@ -26,6 +26,7 @@
 #include "preferences/colorpalettesettings.h"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
+#include "util/compatibility.h"
 #include "util/desktophelper.h"
 #include "util/parented_ptr.h"
 #include "util/qt.h"