Merge branch 'main' of git@github.com:mixxxdj/mixxx.git into trackrecord

.pre-commit-config.yaml

@@ -63,7 +63,7 @@ repos:
     #args: [--ignore-words, .codespellignore, --ignore-regex, "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))"]
     exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|ts|wxl))$
 - repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v8.6.0
+  rev: v8.7.0
   hooks:
   - id: eslint
     args: [--fix, --report-unused-disable-directives]
@@ -103,7 +103,7 @@ repos:
   hooks:
   - id: shellcheck
 - repo: https://github.com/DavidAnson/markdownlint-cli2
-  rev: v0.3.2
+  rev: v0.4.0
   hooks:
   - id: markdownlint-cli2
 - repo: local

src/control/control.h

@@ -209,6 +209,7 @@ class ControlDoublePrivate : public QObject {
 /// The constant ControlDoublePrivate version is used as dummy for default
 /// constructed control objects
 class ControlDoublePrivateConst : public ControlDoublePrivate {
+    Q_OBJECT
   public:
     ~ControlDoublePrivateConst() override = default;
 

src/controllers/bulk/bulkenumerator.h

@@ -6,6 +6,7 @@ struct libusb_context;
 
 /// Locate supported USB bulk controllers
 class BulkEnumerator : public ControllerEnumerator {
+    Q_OBJECT
   public:
     explicit BulkEnumerator(UserSettingsPointer pConfig);
     virtual ~BulkEnumerator();

src/controllers/delegates/midibytedelegate.h

@@ -3,6 +3,7 @@
 #include <QStyledItemDelegate>
 
 class MidiByteDelegate : public QStyledItemDelegate {
+    Q_OBJECT
   public:
     MidiByteDelegate(QObject* pParent);
     virtual ~MidiByteDelegate();

src/controllers/delegates/midichanneldelegate.h

@@ -3,6 +3,7 @@
 #include <QStyledItemDelegate>
 
 class MidiChannelDelegate : public QStyledItemDelegate {
+    Q_OBJECT
   public:
     MidiChannelDelegate(QObject* pParent);
     virtual ~MidiChannelDelegate();

src/controllers/delegates/midiopcodedelegate.h

@@ -3,6 +3,7 @@
 #include <QStyledItemDelegate>
 
 class MidiOpCodeDelegate : public QStyledItemDelegate {
+    Q_OBJECT
   public:
     MidiOpCodeDelegate(QObject* pParent);
     virtual ~MidiOpCodeDelegate();

src/controllers/hid/hidenumerator.h

@@ -5,6 +5,7 @@
 /// This class handles discovery and enumeration of DJ controllers that use the
 /// USB-HID protocol.
 class HidEnumerator : public ControllerEnumerator {
+    Q_OBJECT
   public:
     HidEnumerator() = default;
     ~HidEnumerator() override;

src/effects/backends/effectmanifestparameter.h

@@ -7,6 +7,7 @@
 
 #include "effects/defs.h"
 #include "util/assert.h"
+#include "util/compatibility/qhash.h"
 
 class EffectManifestParameter;
 typedef QSharedPointer<EffectManifestParameter> EffectManifestParameterPointer;
@@ -277,6 +278,6 @@ QDebug operator<<(QDebug dbg, const EffectManifestParameter& parameter);
 
 typedef EffectManifestParameter::ParameterType EffectParameterType;
 
-inline uint qHash(const EffectParameterType& parameterType) {
-    return static_cast<uint>(parameterType);
+inline qhash_seed_t qHash(const EffectParameterType& parameterType) {
+    return static_cast<qhash_seed_t>(parameterType);
 }

src/effects/chains/equalizereffectchain.h

@@ -9,6 +9,7 @@
 /// EqualizerEffectChain is hardwired to one input channel, always
 /// enabled, and has the mix knob fully enabled.
 class EqualizerEffectChain : public PerGroupEffectChain {
+    Q_OBJECT
   public:
     EqualizerEffectChain(const QString& group,
             EffectsManager* pEffectsManager,

src/effects/chains/outputeffectchain.h

@@ -5,6 +5,7 @@
 /// OutputEffectChain is hardwired to only one of Mixxx's outputs.
 /// This is used for the main mix equalizer.
 class OutputEffectChain : public EffectChain {
+    Q_OBJECT
   public:
     OutputEffectChain(EffectsManager* pEffectsManager,
             EffectsMessengerPointer pEffectsMessenger);

src/effects/chains/pergroupeffectchain.h

@@ -5,6 +5,7 @@
 /// PerGroupEffectChain is a base class hardwired for one input channel.
 /// The routing switches are not presented to the user.
 class PerGroupEffectChain : public EffectChain {
+    Q_OBJECT
   public:
     PerGroupEffectChain(const QString& group,
             const QString& chainSlotGroup,

src/effects/chains/quickeffectchain.h

@@ -8,6 +8,7 @@
 /// then load it into QuickEffectChain. QuickEffectChain is hardwired to one
 /// input channel with the mix knob fully enabled.
 class QuickEffectChain : public PerGroupEffectChain {
+    Q_OBJECT
   public:
     QuickEffectChain(const QString& group,
             EffectsManager* pEffectsManager,

src/effects/chains/standardeffectchain.h

@@ -8,6 +8,7 @@
 /// linkings. However, the chain enable switch is hidden because it
 /// is redundant with the input routing switches and effect enable switches.
 class StandardEffectChain : public EffectChain {
+    Q_OBJECT
   public:
     StandardEffectChain(unsigned int iChainNumber,
             EffectsManager* pEffectsManager,

src/effects/defs.h

@@ -20,8 +20,8 @@ enum class EffectBackendType {
     Unknown
 };
 
-inline uint qHash(const EffectBackendType& backendType) {
-    return static_cast<uint>(backendType);
+inline qhash_seed_t qHash(const EffectBackendType& backendType) {
+    return static_cast<qhash_seed_t>(backendType);
 }
 
 enum class SignalProcessingStage {

src/engine/bufferscalers/enginebufferscalelinear.h

@@ -8,6 +8,7 @@ constexpr int kiLinearScaleReadAheadLength = 10240;
 
 
 class EngineBufferScaleLinear : public EngineBufferScale  {
+    Q_OBJECT
   public:
     explicit EngineBufferScaleLinear(
             ReadAheadManager *pReadAheadManager);

src/engine/enginepregain.h

@@ -12,6 +12,7 @@ class ControlObject;
 // including user pregain adjustment, ReplayGain value, and vinyl-like
 // adjustments in volume relative to playback speed.
 class EnginePregain : public EngineObject {
+    Q_OBJECT
   public:
     EnginePregain(const QString& group);
     ~EnginePregain() override;

src/engine/positionscratchcontroller.h

@@ -10,6 +10,7 @@ class VelocityController;
 class RateIIFilter;
 
 class PositionScratchController : public QObject {
+    Q_OBJECT
   public:
     PositionScratchController(const QString& group);
     virtual ~PositionScratchController();

src/library/export/dlglibraryexport.cpp

@@ -203,8 +203,8 @@ void DlgLibraryExport::exportRequested() {
 
     // Construct a request to export the library/crates.
     auto pRequest = QSharedPointer<EnginePrimeExportRequest>::create();
-    pRequest->engineLibraryDbDir = QDir{databaseDirectory};
-    pRequest->musicFilesDir = QDir{musicDirectory};
+    pRequest->engineLibraryDbDir.setPath(databaseDirectory);
+    pRequest->musicFilesDir.setPath(musicDirectory);
     pRequest->exportVersion = exportVersion;
     if (m_pCratesList->isEnabled()) {
         const auto selectedItems = m_pCratesList->selectedItems();

src/library/proxytrackmodel.h

@@ -13,6 +13,7 @@
 // TrackModel search calls will not be delivered to the composed TrackModel
 // because filtering is handled by the QSortFilterProxyModel.
 class ProxyTrackModel : public QSortFilterProxyModel, public TrackModel {
+    Q_OBJECT
   public:
     // Construct a new ProxyTrackModel with pTrackModel as the TrackModel it
     // composes. If bHandleSearches is true, then search signals will not be

src/library/rekordbox/rekordboxfeature.h

@@ -40,6 +40,7 @@ class TrackCollectionManager;
 class BaseExternalPlaylistModel;
 
 class RekordboxPlaylistModel : public BaseExternalPlaylistModel {
+    Q_OBJECT
   public:
     RekordboxPlaylistModel(QObject* parent,
             TrackCollectionManager* pTrackCollectionManager,

src/library/serato/seratofeature.cpp

@@ -454,7 +454,7 @@ QString parseDatabase(mixxx::DbConnectionPoolPtr dbConnectionPool, TreeItem* dat
     // Serato does not exist on Linux, if it did, it would probably just mirror
     // the way paths are handled on OSX.
     if (databaseRootDir.canonicalPath().startsWith(QDir::homePath())) {
-        databaseRootDir = QDir::root();
+        databaseRootDir.setPath(QDir::rootPath());
     }
 #endif
 

src/library/serato/seratoplaylistmodel.h

@@ -7,6 +7,7 @@ class TrackCollectionManager;
 class BaseExternalPlaylistModel;
 
 class SeratoPlaylistModel : public BaseExternalPlaylistModel {
+    Q_OBJECT
   public:
     SeratoPlaylistModel(QObject* parent,
             TrackCollectionManager* pTrackCollectionManager,

src/library/traktor/traktorfeature.h

@@ -13,6 +13,7 @@
 #include "library/treeitemmodel.h"
 
 class TraktorTrackModel : public BaseExternalTrackModel {
+    Q_OBJECT
   public:
     TraktorTrackModel(QObject* parent,
                       TrackCollectionManager* pTrackCollectionManager,
@@ -21,6 +22,7 @@ class TraktorTrackModel : public BaseExternalTrackModel {
 };
 
 class TraktorPlaylistModel : public BaseExternalPlaylistModel {
+    Q_OBJECT
   public:
     TraktorPlaylistModel(QObject* parent,
                          TrackCollectionManager* pTrackCollectionManager,

src/qml/asyncimageprovider.h

@@ -11,6 +11,7 @@ namespace mixxx {
 namespace qml {
 
 class AsyncImageResponse : public QQuickImageResponse, public QRunnable {
+    Q_OBJECT
   public:
     AsyncImageResponse(const QString& id, const QSize& requestedSize);
     QQuickTextureFactory* textureFactory() const override;

src/util/battery/batterylinux.h

@@ -3,6 +3,7 @@
 #include "util/battery/battery.h"
 
 class BatteryLinux : public Battery {
+    Q_OBJECT
   public:
     explicit BatteryLinux(QObject* pParent=nullptr);
     ~BatteryLinux() override;

src/util/battery/batterymac.h

@@ -3,6 +3,7 @@
 #include "util/battery/battery.h"
 
 class BatteryMac : public Battery {
+    Q_OBJECT
   public:
     BatteryMac(QObject* pParent=nullptr);
     virtual ~BatteryMac();

src/util/battery/batterywindows.h

@@ -3,6 +3,7 @@
 #include "util/battery/battery.h"
 
 class BatteryWindows : public Battery {
+    Q_OBJECT
   public:
     BatteryWindows(QObject* pParent=nullptr);
     ~BatteryWindows() override = default;

src/util/desktophelper.cpp

@@ -159,7 +159,7 @@ void DesktopHelper::openInFileBrowser(const QStringList& paths) {
         // Otherwise nothing would happen...
         if (!dir.exists()) {
             // it ensures a valid dir for any OS (Windows)
-            dir = QDir::home();
+            dir.setPath(QDir::homePath());
         }
         // not open the same dir twice
         dirPath = dir.absolutePath();

src/util/screensaver.cpp

@@ -174,8 +174,10 @@ void ScreenSaverHelper::triggerUserActivity()
         name=getenv("DISPLAY");
     }
     display=XOpenDisplay(name);
-    XResetScreenSaver(display);
-    XCloseDisplay(display);
+    if (display != nullptr) {
+        XResetScreenSaver(display);
+        XCloseDisplay(display);
+    }
     return;
 }
 // Disabling the method with DBus since it seems to be failing on several systems.

src/util/workerthreadscheduler.h

@@ -10,6 +10,7 @@ class WorkerThread;
 /// as a worker thread. The maximum number of worker threads is
 /// limited.
 class WorkerThreadScheduler : public WorkerThread {
+    Q_OBJECT
   public:
     explicit WorkerThreadScheduler(
             int maxWorkers,

src/vinylcontrol/vinylcontrol.h

@@ -9,6 +9,7 @@
 class ControlProxy;
 
 class VinylControl : public QObject {
+    Q_OBJECT
   public:
     VinylControl(UserSettingsPointer pConfig, const QString& group);
     virtual ~VinylControl();

src/vinylcontrol/vinylcontrolxwax.h

@@ -21,6 +21,7 @@ extern "C" {
 #define QUALITY_RING_SIZE 32
 
 class VinylControlXwax : public VinylControl {
+    Q_OBJECT
   public:
     VinylControlXwax(UserSettingsPointer pConfig, const QString& group);
     virtual ~VinylControlXwax();

src/widget/wanalysislibrarytableview.h

@@ -6,6 +6,7 @@
 #include "widget/wtracktableview.h"
 
 class WAnalysisLibraryTableView : public WTrackTableView {
+    Q_OBJECT
   public:
     WAnalysisLibraryTableView(
             QWidget* parent,

src/widget/woverviewhsv.h

@@ -3,6 +3,7 @@
 #include "widget/woverview.h"
 
 class WOverviewHSV : public WOverview {
+    Q_OBJECT
   public:
     WOverviewHSV(
             const QString& group,

src/widget/woverviewlmh.h

@@ -3,6 +3,7 @@
 #include "widget/woverview.h"
 
 class WOverviewLMH : public WOverview {
+    Q_OBJECT
   public:
     WOverviewLMH(
             const QString& group,

src/widget/woverviewrgb.h

@@ -3,6 +3,7 @@
 #include "widget/woverview.h"
 
 class WOverviewRGB : public WOverview {
+    Q_OBJECT
   public:
     WOverviewRGB(
             const QString& group,