Merge branch '2.4' of github.com:mixxxdj/mixxx

Holzhaus · Sep 25, 2023 · 8fdd662 · 8fdd662
2 parents 48884a8 + aa5ed24
commit 8fdd662
Show file tree

Hide file tree

Showing 23 changed files with 55 additions and 155 deletions.
diff --git a/src/controllers/hid/hiddenylist.h b/src/controllers/hid/hiddenylist.h
@@ -9,7 +9,7 @@ typedef struct hid_denylist {
 } hid_denylist_t;
 
 /// USB HID device that should not be recognized as controllers
-hid_denylist_t hid_denylisted[] = {
+constexpr hid_denylist_t hid_denylisted[] = {
         {0x1157, 0x300, 0x1, 0x2, -1},  // EKS Otus mouse pad (OS/X,windows)
         {0x1157, 0x300, 0x0, 0x0, 0x3}, // EKS Otus mouse pad (linux)
         {0x04f3, 0x2d26, 0x0, 0x0, -1}, // ELAN2D26:00 Touch screen

diff --git a/src/effects/effectxmlelements.h b/src/effects/effectxmlelements.h
diff --git a/src/effects/presets/effectxmlelements.h b/src/effects/presets/effectxmlelements.h
@@ -1,3 +1,5 @@
+#pragma once
+
 namespace EffectXml {
 const QString kFileHeader(QStringLiteral("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"));
 // Version history:

diff --git a/src/library/rekordbox/rekordboxconstants.h b/src/library/rekordbox/rekordboxconstants.h
@@ -1,3 +1,5 @@
+#pragma once
+
 namespace mixxx {
 namespace rekordboxconstants {
 const QString beatsSubversion = QStringLiteral("Rekordbox USB drive");

diff --git a/src/test/baseeffecttest.cpp b/src/test/baseeffecttest.cpp
diff --git a/src/test/baseeffecttest.h b/src/test/baseeffecttest.h
diff --git a/src/util/lcs.h b/src/util/lcs.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <QString>
 #include <QVector>
 #include <cstring>

diff --git a/src/waveform/renderers/allshader/waveformrenderbackground.cpp b/src/waveform/renderers/allshader/waveformrenderbackground.cpp
@@ -2,7 +2,7 @@
 
 #include "waveform/renderers/waveformwidgetrenderer.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRenderBackground::WaveformRenderBackground(
         WaveformWidgetRenderer* waveformWidgetRenderer)
@@ -28,3 +28,5 @@ void WaveformRenderBackground::paintGL() {
             1.f);
     glClear(GL_COLOR_BUFFER_BIT);
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrenderbeat.cpp b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
@@ -10,7 +10,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRenderBeat::WaveformRenderBeat(WaveformWidgetRenderer* waveformWidget)
         : WaveformRenderer(waveformWidget) {
@@ -125,3 +125,5 @@ void WaveformRenderBeat::paintGL() {
     m_shader.disableAttributeArray(vertexLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrenderer.cpp b/src/waveform/renderers/allshader/waveformrenderer.cpp
@@ -2,7 +2,7 @@
 
 #include "waveform/widgets/allshader/waveformwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRenderer::WaveformRenderer(WaveformWidgetRenderer* widget)
         : ::WaveformRendererAbstract(widget) {
@@ -13,3 +13,5 @@ void WaveformRenderer::draw(QPainter* painter, QPaintEvent* event) {
     Q_UNUSED(event);
     DEBUG_ASSERT(false);
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
@@ -20,7 +20,7 @@ constexpr float horizontalGradientArray[] = {-1.f, 1.f, -1.f, 1.f};
 
 } // anonymous namespace
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRendererEndOfTrack::WaveformRendererEndOfTrack(
         WaveformWidgetRenderer* waveformWidget)
@@ -109,3 +109,5 @@ void WaveformRendererEndOfTrack::paintGL() {
         fillWithGradient(color);
     }
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -9,7 +9,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRendererFiltered::WaveformRendererFiltered(
         WaveformWidgetRenderer* waveformWidget)
@@ -196,3 +196,5 @@ void WaveformRendererFiltered::paintGL() {
     m_shader.disableAttributeArray(positionLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -10,7 +10,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRendererHSV::WaveformRendererHSV(
         WaveformWidgetRenderer* waveformWidget)
@@ -211,3 +211,5 @@ void WaveformRendererHSV::paintGL() {
     m_shader.disableAttributeArray(colorLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -9,7 +9,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 namespace {
 inline float math_pow2(float x) {
@@ -226,3 +226,5 @@ void WaveformRendererLRRGB::paintGL() {
     m_shader.disableAttributeArray(colorLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -9,7 +9,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRendererPreroll::WaveformRendererPreroll(WaveformWidgetRenderer* waveformWidget)
         : WaveformRenderer(waveformWidget) {
@@ -141,3 +141,5 @@ void WaveformRendererPreroll::paintGL() {
     m_shader.disableAttributeArray(vertexLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -9,7 +9,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 namespace {
 inline float math_pow2(float x) {
@@ -225,3 +225,5 @@ void WaveformRendererRGB::paintGL() {
     m_shader.disableAttributeArray(colorLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -9,7 +9,7 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-using namespace allshader;
+namespace allshader {
 
 WaveformRendererSimple::WaveformRendererSimple(
         WaveformWidgetRenderer* waveformWidget)
@@ -177,3 +177,5 @@ void WaveformRendererSimple::paintGL() {
     m_shader.disableAttributeArray(positionLocation);
     m_shader.release();
 }
+
+} // namespace allshader
diff --git a/src/waveform/widgets/allshader/filteredwaveformwidget.cpp b/src/waveform/widgets/allshader/filteredwaveformwidget.cpp
@@ -9,7 +9,7 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 #include "waveform/widgets/allshader/moc_filteredwaveformwidget.cpp"
 
-using namespace allshader;
+namespace allshader {
 
 FilteredWaveformWidget::FilteredWaveformWidget(const QString& group, QWidget* parent)
         : WaveformWidget(group, parent) {
@@ -31,3 +31,5 @@ void FilteredWaveformWidget::castToQWidget() {
 void FilteredWaveformWidget::paintEvent(QPaintEvent* event) {
     Q_UNUSED(event);
 }
+
+} // namespace allshader
diff --git a/src/waveform/widgets/allshader/hsvwaveformwidget.cpp b/src/waveform/widgets/allshader/hsvwaveformwidget.cpp
@@ -9,7 +9,7 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 #include "waveform/widgets/allshader/moc_hsvwaveformwidget.cpp"
 
-using namespace allshader;
+namespace allshader {
 
 HSVWaveformWidget::HSVWaveformWidget(const QString& group, QWidget* parent)
         : WaveformWidget(group, parent) {
@@ -31,3 +31,5 @@ void HSVWaveformWidget::castToQWidget() {
 void HSVWaveformWidget::paintEvent(QPaintEvent* event) {
     Q_UNUSED(event);
 }
+
+} // namespace allshader
diff --git a/src/waveform/widgets/allshader/lrrgbwaveformwidget.cpp b/src/waveform/widgets/allshader/lrrgbwaveformwidget.cpp
@@ -9,7 +9,7 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 #include "waveform/widgets/allshader/moc_lrrgbwaveformwidget.cpp"
 
-using namespace allshader;
+namespace allshader {
 
 LRRGBWaveformWidget::LRRGBWaveformWidget(const QString& group, QWidget* parent)
         : WaveformWidget(group, parent) {
@@ -31,3 +31,5 @@ void LRRGBWaveformWidget::castToQWidget() {
 void LRRGBWaveformWidget::paintEvent(QPaintEvent* event) {
     Q_UNUSED(event);
 }
+
+} // namespace allshader
diff --git a/src/waveform/widgets/allshader/rgbwaveformwidget.cpp b/src/waveform/widgets/allshader/rgbwaveformwidget.cpp
@@ -9,7 +9,7 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 #include "waveform/widgets/allshader/moc_rgbwaveformwidget.cpp"
 
-using namespace allshader;
+namespace allshader {
 
 RGBWaveformWidget::RGBWaveformWidget(const QString& group, QWidget* parent)
         : WaveformWidget(group, parent) {
@@ -31,3 +31,5 @@ void RGBWaveformWidget::castToQWidget() {
 void RGBWaveformWidget::paintEvent(QPaintEvent* event) {
     Q_UNUSED(event);
 }
+
+} // namespace allshader
diff --git a/src/waveform/widgets/allshader/simplewaveformwidget.cpp b/src/waveform/widgets/allshader/simplewaveformwidget.cpp
@@ -9,7 +9,7 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 #include "waveform/widgets/allshader/moc_simplewaveformwidget.cpp"
 
-using namespace allshader;
+namespace allshader {
 
 SimpleWaveformWidget::SimpleWaveformWidget(const QString& group, QWidget* parent)
         : WaveformWidget(group, parent) {
@@ -31,3 +31,5 @@ void SimpleWaveformWidget::castToQWidget() {
 void SimpleWaveformWidget::paintEvent(QPaintEvent* event) {
     Q_UNUSED(event);
 }
+
+} // namespace allshader