Merge pull request #13223 from Swiftb0y/refactor/gh13222-util-deprecate

Refactor/gh13222 util deprecate

CMakeLists.txt

@@ -1349,7 +1349,6 @@ target_precompile_headers(mixxx-lib PUBLIC
   src/util/mac.h
   src/util/macros.h
   src/util/math.h
-  src/util/memory.h
   src/util/messagepipe.h
   src/util/movinginterquartilemean.h
   src/util/mutex.h

src/analyzer/analyzerbeats.h

@@ -2,12 +2,12 @@
 
 #include <QHash>
 #include <QList>
+#include <memory>
 
 #include "analyzer/analyzer.h"
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/beatdetectionsettings.h"
 #include "preferences/usersettings.h"
-#include "util/memory.h"
 
 class AnalyzerBeats : public Analyzer {
   public:

src/analyzer/analyzerkey.h

@@ -3,12 +3,12 @@
 #include <QHash>
 #include <QList>
 #include <QString>
+#include <memory>
 
 #include "analyzer/analyzer.h"
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/keydetectionsettings.h"
 #include "track/track_decl.h"
-#include "util/memory.h"
 
 class AnalyzerKey : public Analyzer {
   public:

src/analyzer/analyzerthread.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <optional>
 #include <vector>
 
@@ -12,7 +13,6 @@
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/db/dbconnectionpool.h"
-#include "util/memory.h"
 #include "util/performancetimer.h"
 #include "util/samplebuffer.h"
 #include "util/workerthread.h"

src/analyzer/plugins/analyzerqueenmarybeats.h

@@ -1,12 +1,11 @@
 #pragma once
 
-#include <vector>
-
 #include <QObject>
+#include <memory>
+#include <vector>
 
 #include "analyzer/plugins/analyzerplugin.h"
 #include "analyzer/plugins/buffering_utils.h"
-#include "util/memory.h"
 
 class DetectionFunction;
 

src/analyzer/plugins/analyzerqueenmarykey.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <QObject>
+#include <memory>
 
 #include "analyzer/plugins/analyzerplugin.h"
 #include "analyzer/plugins/buffering_utils.h"
-#include "util/memory.h"
 #include "util/types.h"
 
 class GetKeyMode;

src/analyzer/plugins/analyzersoundtouchbeats.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <QObject>
+#include <memory>
 
 #include "analyzer/plugins/analyzerplugin.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 
 namespace soundtouch {

src/control/controlproxy.h

@@ -6,7 +6,6 @@
 
 #include "control/control.h"
 #include "preferences/usersettings.h"
-#include "util/platform.h"
 
 //// This class is the successor of ControlObjectThread. It should be used for
 /// new code to avoid unnecessary locking during send if no slot is connected.
@@ -59,7 +58,7 @@ class ControlProxy : public QObject {
             break;
         case Qt::BlockingQueuedConnection:
             // We must not block the signal source by a blocking connection
-            M_FALLTHROUGH_INTENDED;
+            [[fallthrough]];
         default:
             DEBUG_ASSERT(false);
             return false;

src/effects/backends/builtin/balanceeffect.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <memory>
+
 #include "effects/backends/effectprocessor.h"
 #include "engine/filters/enginefilterlinkwitzriley4.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 
 class BalanceGroupState : public EffectState {

src/effects/backends/builtin/biquadfullkilleqeffect.h

@@ -1,11 +1,12 @@
 #pragma once
 
+#include <memory>
+
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/filters/enginefilterbessel4.h"
 #include "engine/filters/enginefilterbiquad1.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 

src/effects/backends/builtin/loudnesscontoureffect.h

@@ -1,7 +1,8 @@
 #pragma once
 
+#include <memory>
+
 #include "effects/backends/effectprocessor.h"
-#include "util/memory.h"
 #include "util/types.h"
 
 class EngineFilterBiquad1HighShelving;

src/effects/backends/builtin/parametriceqeffect.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <QMap>
+#include <memory>
 #include <vector>
 
 #include "audio/types.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/filters/enginefilterbiquad1.h"
 #include "util/class.h"
-#include "util/memory.h"
 #include "util/types.h"
 
 // The ParametricEQEffect models the mid bands from a SSL Black EQ (242)

src/effects/backends/builtin/threebandbiquadeqeffect.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <memory>
+
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/filters/enginefilterbiquad1.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 

src/effects/effectchain.h

@@ -2,12 +2,12 @@
 
 #include <QList>
 #include <QObject>
+#include <memory>
 
 #include "effects/defs.h"
 #include "effects/effectchainmixmode.h"
 #include "engine/channelhandle.h"
 #include "util/class.h"
-#include "util/memory.h"
 
 class ControlObject;
 class ControlPushButton;

src/encoder/encoder.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <memory>
+
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encodersettings.h"
 #include "preferences/usersettings.h"
-#include "util/memory.h"
 #include "util/types.h"
 
 class EncoderCallback;

src/encoder/encoderopus.h

@@ -6,11 +6,11 @@
 #include <QMap>
 #include <QString>
 #include <QVector>
+#include <memory>
 
 #include "audio/types.h"
 #include "encoder/encoder.h"
 #include "util/fifo.h"
-#include "util/memory.h"
 
 class EncoderCallback;
 class EncoderSettings;

src/encoder/encodersettings.h

@@ -2,7 +2,7 @@
 
 #include <QList>
 #include <QObject>
-#include "util/memory.h"
+#include <memory>
 
 /// Encoder settings interface for encoders
 class EncoderSettings {

src/engine/bufferscalers/enginebufferscalerubberband.h

@@ -3,9 +3,9 @@
 #include <rubberband/RubberBandStretcher.h>
 
 #include <array>
+#include <memory>
 
 #include "engine/bufferscalers/enginebufferscale.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 
 class ReadAheadManager;

src/engine/bufferscalers/enginebufferscalest.h

@@ -1,7 +1,8 @@
 #pragma once
 
+#include <memory>
+
 #include "engine/bufferscalers/enginebufferscale.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 
 class ReadAheadManager;

src/engine/effects/engineeffect.h

@@ -4,12 +4,12 @@
 #include <QSet>
 #include <QString>
 #include <QVector>
+#include <memory>
 
 #include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/channelhandle.h"
 #include "engine/effects/message.h"
-#include "util/memory.h"
 #include "util/types.h"
 
 /// EngineEffect is a generic wrapper around an EffectProcessor which intermediates

src/engine/effects/message.h

@@ -3,11 +3,11 @@
 #include <QString>
 #include <QVariant>
 #include <QtGlobal>
+#include <memory>
 
 #include "effects/defs.h"
 #include "effects/effectchainmixmode.h"
 #include "engine/channelhandle.h"
-#include "util/memory.h"
 #include "util/messagepipe.h"
 
 class EngineEffectChain;

src/library/basetracktablemodel.cpp

@@ -615,7 +615,7 @@ QVariant BaseTrackTableModel::roleValue(
             // Same value as for Qt::DisplayRole (see below)
             break;
         }
-        M_FALLTHROUGH_INTENDED;
+        [[fallthrough]];
     // NOTE: for export we need to fall through to Qt::DisplayRole,
     // so do not add any other role cases here, or the export
     // will be empty

src/library/browse/browsefeature.cpp

@@ -5,14 +5,14 @@
 #include <QMenu>
 #include <QPushButton>
 #include <QStringList>
+#include <memory>
 
 #include "library/browse/foldertreemodel.h"
 #include "library/library.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "moc_browsefeature.cpp"
-#include "util/memory.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "widget/wlibrarytextbrowser.h"

src/library/dao/trackdao.h

@@ -4,13 +4,13 @@
 #include <QObject>
 #include <QSet>
 #include <QString>
+#include <memory>
 
 #include "library/dao/dao.h"
 #include "library/relocatedtrack.h"
 #include "preferences/usersettings.h"
 #include "track/globaltrackcache.h"
 #include "util/class.h"
-#include "util/memory.h"
 
 class SqlTransaction;
 class PlaylistDAO;

src/library/librarycontrol.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <QObject>
+#include <memory>
 
 #include "control/controlproxy.h"
 #include "library/library_decl.h"
-#include "util/memory.h"
 
 class ControlEncoder;
 class ControlObject;

src/library/searchquery.h

@@ -5,13 +5,13 @@
 #include <QSqlDatabase>
 #include <QString>
 #include <QStringList>
+#include <memory>
 #include <utility>
 #include <vector>
 
 #include "proto/keys.pb.h"
 #include "track/track_decl.h"
 #include "util/assert.h"
-#include "util/memory.h"
 
 class CrateStorage;
 class TrackId;

src/library/treeitem.h

@@ -4,9 +4,9 @@
 #include <QList>
 #include <QString>
 #include <QVariant>
+#include <memory>
 
 #include "util/assert.h"
-#include "util/memory.h"
 
 class LibraryFeature;
 

src/library/treeitemmodel.h

@@ -3,8 +3,7 @@
 #include <QAbstractItemModel>
 #include <QModelIndex>
 #include <QVariant>
-
-#include "util/memory.h"
+#include <memory>
 
 class TreeItem;
 

src/mixer/basetrackplayer.h

@@ -1,13 +1,14 @@
 #pragma once
 
+#include <memory>
+
 #include "engine/channels/enginechannel.h"
 #include "mixer/baseplayer.h"
 #include "preferences/usersettings.h"
 #include "track/replaygain.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/color/rgbcolor.h"
-#include "util/memory.h"
 #include "util/parented_ptr.h"
 #include "util/performancetimer.h"
 

src/mixer/samplerbank.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <QObject>
+#include <memory>
 
 #include "preferences/usersettings.h"
-#include "util/memory.h"
 
 class ControlObject;
 class ControlProxy;

src/skin/legacy/legacyskinparser.h

@@ -5,12 +5,12 @@
 #include <QObject>
 #include <QSet>
 #include <QString>
+#include <memory>
 
 #include "preferences/usersettings.h"
 #include "proto/skin.pb.h"
 #include "skin/legacy/skinparser.h"
 #include "skin/legacy/tooltips.h"
-#include "util/memory.h"
 #include "vinylcontrol/vinylcontrolmanager.h"
 
 class WBaseWidget;