Merge branch '2.3' of github.com:mixxxdj/mixxx into float-warnings-pt-6

23 files changed, 47 insertions, 31 deletions

diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index 0bc34c23a1..3b28624f66 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -9,7 +9,6 @@
 
 #include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
-#include "track/track.h"
 #include "library/coverartcache.h"
 #include "skin/skincontext.h"
 #include "widget/trackdroptarget.h"
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index 943265fed2..1e06646367 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -4,6 +4,7 @@
 
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
+#include "track/track.h"
 #include "util/compatibility.h"
 #include "widget/wcoverartmenu.h"
 
diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h
index 6df0ad135b..23df1050cc 100644
--- a/src/widget/wcoverartlabel.h
+++ b/src/widget/wcoverartlabel.h
@@ -5,11 +5,13 @@
 #include <QPixmap>
 #include <QWidget>
 
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/parented_ptr.h"
 
 class WCoverArtMenu;
 class DlgCoverArtFullSize;
+class CoverInfo;
+class CoverInfoRelative;
 
 class WCoverArtLabel : public QLabel {
     Q_OBJECT
diff --git a/src/widget/wcoverartmenu.h b/src/widget/wcoverartmenu.h
index cacc15ed9e..e86c713d4d 100644
--- a/src/widget/wcoverartmenu.h
+++ b/src/widget/wcoverartmenu.h
@@ -6,7 +6,6 @@
 #include <QWidget>
 #include <QPixmap>
 
-#include "track/track.h"
 #include "library/coverart.h"
 
 // This class implements a context-menu with all CoverArt user actions. Callers
diff --git a/src/widget/wcuemenupopup.cpp b/src/widget/wcuemenupopup.cpp
index 6b270f5559..48cf25fffb 100644
--- a/src/widget/wcuemenupopup.cpp
+++ b/src/widget/wcuemenupopup.cpp
@@ -5,6 +5,7 @@
 #include <QVBoxLayout>
 
 #include "engine/engine.h"
+#include "track/track.h"
 #include "util/color/color.h"
 
 WCueMenuPopup::WCueMenuPopup(UserSettingsPointer pConfig, QWidget* parent)
diff --git a/src/widget/wcuemenupopup.h b/src/widget/wcuemenupopup.h
index fdb265c489..940be0219d 100644
--- a/src/widget/wcuemenupopup.h
+++ b/src/widget/wcuemenupopup.h
@@ -6,7 +6,7 @@
 
 #include "preferences/colorpalettesettings.h"
 #include "track/cue.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/widgethelper.h"
 #include "widget/wcolorpicker.h"
 
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index 74a73adb18..16ac43b77e 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -5,6 +5,7 @@
 #include <QtDebug>
 
 #include "mixer/playerinfo.h"
+#include "track/track.h"
 
 WHotcueButton::WHotcueButton(const QString& group, QWidget* pParent)
         : WPushButton(pParent),
diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp
index 48404061b2..5a07154bc5 100644
--- a/src/widget/wlabel.cpp
+++ b/src/widget/wlabel.cpp
@@ -132,7 +132,8 @@ bool WLabel::event(QEvent* pEvent) {
         // resetting the font to the original css values.
         // Only scale pixel size fonts, point size fonts are scaled by the OS
         if (fonti.pixelSize() > 0) {
-            const_cast<QFont&>(fonti).setPixelSize(fonti.pixelSize() * m_scaleFactor);
+            const_cast<QFont&>(fonti).setPixelSize(
+                    static_cast<int>(fonti.pixelSize() * m_scaleFactor));
         }
         // measure text with the new font
         setText(m_longText);
diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h
index df763808a8..da2413a1dc 100644
--- a/src/widget/wlibrarytableview.h
+++ b/src/widget/wlibrarytableview.h
@@ -4,13 +4,13 @@
 #ifndef WLIBRARYTABLEVIEW_H
 #define WLIBRARYTABLEVIEW_H
 
+#include <QFont>
 #include <QString>
 #include <QTableView>
-#include <QFont>
 
-#include "preferences/usersettings.h"
 #include "library/libraryview.h"
-#include "track/track.h"
+#include "preferences/usersettings.h"
+#include "track/track_decl.h"
 
 class TrackModel;
 
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index bfc4f0d1b6..e2ed5948fd 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -20,12 +20,13 @@
 
 #include "analyzer/analyzerprogress.h"
 #include "skin/skincontext.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/color/color.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformmarkset.h"
 #include "waveform/renderers/waveformsignalcolors.h"
+#include "waveform/waveform.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wcuemenupopup.h"
 #include "widget/wwidget.h"
diff --git a/src/widget/wspinny.h b/src/widget/wspinny.h
index 31d4e69c4e..190094af42 100644
--- a/src/widget/wspinny.h
+++ b/src/widget/wspinny.h
@@ -2,16 +2,16 @@
 #ifndef _WSPINNY_H
 #define _WSPINNY_H
 
+#include <QEvent>
 #include <QGLWidget>
-#include <QShowEvent>
 #include <QHideEvent>
-#include <QEvent>
+#include <QShowEvent>
 
 #include "library/dlgcoverartfullsize.h"
 #include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
 #include "skin/skincontext.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "vinylcontrol/vinylsignalquality.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wbasewidget.h"
diff --git a/src/widget/wstarrating.cpp b/src/widget/wstarrating.cpp
index db98a0ad7c..e6c01aaa22 100644
--- a/src/widget/wstarrating.cpp
+++ b/src/widget/wstarrating.cpp
@@ -1,9 +1,11 @@
-#include <QStylePainter>
-#include <QStyleOption>
-#include <QSize>
+#include "widget/wstarrating.h"
+
 #include <QApplication>
+#include <QSize>
+#include <QStyleOption>
+#include <QStylePainter>
 
-#include "widget/wstarrating.h"
+#include "track/track.h"
 
 WStarRating::WStarRating(QString group, QWidget* pParent)
         : WWidget(pParent),
diff --git a/src/widget/wstarrating.h b/src/widget/wstarrating.h
index aef62f1810..6304efe605 100644
--- a/src/widget/wstarrating.h
+++ b/src/widget/wstarrating.h
@@ -5,14 +5,13 @@
 #include <QMouseEvent>
 #include <QStylePainter>
 
-#include "skin/skincontext.h"
-#include "track/track.h"
-
+#include "control/controlpushbutton.h"
 #include "library/starrating.h"
+#include "skin/skincontext.h"
+#include "track/track_decl.h"
+#include "track/trackid.h"
 #include "widget/wwidget.h"
 
-#include "control/controlpushbutton.h"
-
 class ControlObject;
 class ControlPushButton;
 
diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h
index a822804516..cd898fa5c1 100644
--- a/src/widget/wtrackmenu.h
+++ b/src/widget/wtrackmenu.h
@@ -5,10 +5,12 @@
 #include <QPointer>
 #include <memory>
 
+#include "library/coverart.h"
 #include "library/dao/playlistdao.h"
 #include "library/trackprocessing.h"
 #include "preferences/usersettings.h"
 #include "track/trackref.h"
+#include "util/color/rgbcolor.h"
 
 class ControlProxy;
 class DlgTagFetcher;
diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
index 39968b2a1c..d540e7b8ef 100644
--- a/src/widget/wtrackproperty.cpp
+++ b/src/widget/wtrackproperty.cpp
@@ -1,10 +1,12 @@
+#include "widget/wtrackproperty.h"
+
 #include <QDebug>
 #include <QUrl>
 
 #include "control/controlobject.h"
-#include "widget/wtrackmenu.h"
-#include "widget/wtrackproperty.h"
+#include "track/track.h"
 #include "util/dnd.h"
+#include "widget/wtrackmenu.h"
 
 namespace {
 const WTrackMenu::Features kTrackMenuFeatures =
diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
index 75e14b36f7..fe4c5edccb 100644
--- a/src/widget/wtrackproperty.h
+++ b/src/widget/wtrackproperty.h
@@ -6,7 +6,8 @@
 
 #include "preferences/usersettings.h"
 #include "skin/skincontext.h"
-#include "track/track.h"
+#include "track/track_decl.h"
+#include "track/trackid.h"
 #include "util/parented_ptr.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wlabel.h"
diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index f00d982ab0..bd7f7b56b6 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -7,7 +7,6 @@
 #include "library/dao/playlistdao.h"
 #include "library/trackmodel.h" // Can't forward declare enums
 #include "preferences/usersettings.h"
-#include "track/track.h"
 #include "util/duration.h"
 #include "util/parented_ptr.h"
 #include "widget/wlibrarytableview.h"
diff --git a/src/widget/wtracktext.cpp b/src/widget/wtracktext.cpp
index 52c0bb2d64..251b7256d2 100644
--- a/src/widget/wtracktext.cpp
+++ b/src/widget/wtracktext.cpp
@@ -1,11 +1,13 @@
 
+#include "widget/wtracktext.h"
+
 #include <QDebug>
 #include <QUrl>
 
 #include "control/controlobject.h"
-#include "widget/wtrackmenu.h"
-#include "widget/wtracktext.h"
+#include "track/track.h"
 #include "util/dnd.h"
+#include "widget/wtrackmenu.h"
 
 namespace {
 const WTrackMenu::Features trackMenuFeatures =
diff --git a/src/widget/wtracktext.h b/src/widget/wtracktext.h
index 30a5e94304..106408da34 100644
--- a/src/widget/wtracktext.h
+++ b/src/widget/wtracktext.h
@@ -5,7 +5,8 @@
 #include <QMouseEvent>
 
 #include "preferences/usersettings.h"
-#include "track/track.h"
+#include "track/track_decl.h"
+#include "track/trackid.h"
 #include "util/parented_ptr.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wlabel.h"
diff --git a/src/widget/wtrackwidgetgroup.cpp b/src/widget/wtrackwidgetgroup.cpp
index c721059e85..035c8679ce 100644
--- a/src/widget/wtrackwidgetgroup.cpp
+++ b/src/widget/wtrackwidgetgroup.cpp
@@ -6,6 +6,7 @@
 #include <QUrl>
 
 #include "control/controlobject.h"
+#include "track/track.h"
 #include "util/dnd.h"
 #include "widget/wtrackmenu.h"
 
diff --git a/src/widget/wtrackwidgetgroup.h b/src/widget/wtrackwidgetgroup.h
index bfd5f6046e..839e59c349 100644
--- a/src/widget/wtrackwidgetgroup.h
+++ b/src/widget/wtrackwidgetgroup.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "skin/skincontext.h"
-#include "track/track.h"
+#include "track/track_decl.h"
+#include "track/trackid.h"
 #include "util/parented_ptr.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wwidgetgroup.h"
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index b8b8df61ec..ec19d5d2ca 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -9,7 +9,7 @@
 #include <QMutex>
 
 #include "skin/skincontext.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmark.h"
 #include "widget/trackdroptarget.h"
diff --git a/src/widget/wwidget.cpp b/src/widget/wwidget.cpp
index 364b46280a..4f05531072 100644
--- a/src/widget/wwidget.cpp
+++ b/src/widget/wwidget.cpp
@@ -51,7 +51,8 @@ bool WWidget::event(QEvent* e) {
         // resetting the font to the original css values.
         // Only scale pixel size fonts, point size fonts are scaled by the OS
         if (fonti.pixelSize() > 0) {
-            const_cast<QFont&>(fonti).setPixelSize(fonti.pixelSize() * m_scaleFactor);
+            const_cast<QFont&>(fonti).setPixelSize(
+                    static_cast<int>(fonti.pixelSize() * m_scaleFactor));
         }
     } else if (isEnabled()) {
         switch(e->type()) {