diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-09 14:42:41 +0200 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-09 14:42:41 +0200 |
commit | c792c7ce76fb10f6e733f0cc41cf43878b425e47 (patch) | |
tree | 006674c42c0a9db00b6a386cd999cb04570b6ca4 /src/library | |
parent | 817c2f1f7417b859b0508c8f965f8cab274ca51a (diff) | |
parent | bee15eeed753e63810cf8497e9631cce2d7e3416 (diff) |
Merge branch '2.3' of github.com:mixxxdj/mixxx into float-warnings-pt-3
Diffstat (limited to 'src/library')
49 files changed, 161 insertions, 152 deletions
diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h index 22ef64b1cb..62267b7727 100644 --- a/src/library/autodj/autodjprocessor.h +++ b/src/library/autodj/autodjprocessor.h @@ -1,16 +1,16 @@ #ifndef AUTODJPROCESSOR_H #define AUTODJPROCESSOR_H +#include <QModelIndexList> #include <QObject> #include <QString> -#include <QModelIndexList> -#include "preferences/usersettings.h" #include "control/controlproxy.h" #include "engine/channels/enginechannel.h" #include "engine/controls/cuecontrol.h" #include "library/playlisttablemodel.h" -#include "track/track.h" +#include "preferences/usersettings.h" +#include "track/track_decl.h" #include "util/class.h" class ControlPushButton; diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp index b80465998b..cea92beec2 100644 --- a/src/library/autodj/dlgautodj.cpp +++ b/src/library/autodj/dlgautodj.cpp @@ -190,7 +190,7 @@ DlgAutoDJ::DlgAutoDJ( // Setup DlgAutoDJ UI based on the current AutoDJProcessor state. Keep in // mind that AutoDJ may already be active when DlgAutoDJ is created (due to // skin changes, etc.). - spinBoxTransition->setValue(m_pAutoDJProcessor->getTransitionTime()); + spinBoxTransition->setValue(static_cast<int>(m_pAutoDJProcessor->getTransitionTime())); connect(m_pAutoDJProcessor, &AutoDJProcessor::transitionTimeChanged, this, diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h index a9b96daef6..b5e8761877 100644 --- a/src/library/autodj/dlgautodj.h +++ b/src/library/autodj/dlgautodj.h @@ -1,17 +1,17 @@ #ifndef DLGAUTODJ_H #define DLGAUTODJ_H -#include <QWidget> #include <QString> +#include <QWidget> +#include "controllers/keyboard/keyboardeventfilter.h" +#include "library/autodj/autodjprocessor.h" #include "library/autodj/ui_dlgautodj.h" -#include "preferences/usersettings.h" -#include "track/track.h" -#include "library/libraryview.h" #include "library/library.h" +#include "library/libraryview.h" #include "library/trackcollection.h" -#include "library/autodj/autodjprocessor.h" -#include "controllers/keyboard/keyboardeventfilter.h" +#include "preferences/usersettings.h" +#include "track/track_decl.h" class PlaylistTableModel; class WLibrary; diff --git a/src/library/basecoverartdelegate.cpp b/src/library/basecoverartdelegate.cpp index d957f35940..2d60b3a94b 100644 --- a/src/library/basecoverartdelegate.cpp +++ b/src/library/basecoverartdelegate.cpp @@ -1,11 +1,11 @@ -#include "library/coverartdelegate.h" - #include <QPainter> #include <algorithm> #include "library/coverartcache.h" +#include "library/coverartdelegate.h" #include "library/dao/trackschema.h" #include "library/trackmodel.h" +#include "track/track.h" #include "util/logger.h" #include "widget/wlibrarytableview.h" @@ -119,7 +119,7 @@ void BaseCoverArtDelegate::paintItem( QPixmap pixmap = m_pCache->tryLoadCover( this, coverInfo, - option.rect.width() * scaleFactor, + static_cast<int>(option.rect.width() * scaleFactor), m_inhibitLazyLoading ? CoverArtCache::Loading::CachedOnly : CoverArtCache::Loading::Default); if (pixmap.isNull()) { // Cache miss diff --git a/src/library/basecoverartdelegate.h b/src/library/basecoverartdelegate.h index d7f231f204..b7fd9f15c2 100644 --- a/src/library/basecoverartdelegate.h +++ b/src/library/basecoverartdelegate.h @@ -4,8 +4,9 @@ #include <QList> #include <QTableView> +#include "library/coverart.h" #include "library/tableitemdelegate.h" -#include "track/track.h" +#include "track/track_decl.h" #include "util/cache.h" class CoverArtCache; diff --git a/src/library/baseplaylistfeature.h b/src/library/baseplaylistfeature.h index 21d967c882..9d18623b12 100644 --- a/src/library/baseplaylistfeature.h +++ b/src/library/baseplaylistfeature.h @@ -11,7 +11,7 @@ #include "library/basetracksetfeature.h" #include "library/dao/playlistdao.h" -#include "track/track.h" +#include "track/track_decl.h" class WLibrary; class KeyboardEventFilter; diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp index 72209d5a83..116dfbaf31 100644 --- a/src/library/basesqltablemodel.cpp +++ b/src/library/basesqltablemodel.cpp @@ -617,17 +617,6 @@ QVariant BaseSqlTableModel::rawValue( return m_trackSource->data(trackId, trackSourceColumn); } -QVariant BaseSqlTableModel::roleValue( - const QModelIndex& index, - QVariant&& rawValue, - int role) const { - if (role == Qt::DisplayRole && - index.column() == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { - return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); - } - return BaseTrackTableModel::roleValue(index, std::move(rawValue), role); -} - bool BaseSqlTableModel::setTrackValueForColumn( const TrackPointer& pTrack, int column, diff --git a/src/library/basesqltablemodel.h b/src/library/basesqltablemodel.h index 9dcfb26f90..3a5e3df2b6 100644 --- a/src/library/basesqltablemodel.h +++ b/src/library/basesqltablemodel.h @@ -75,10 +75,6 @@ class BaseSqlTableModel : public BaseTrackTableModel { /////////////////////////////////////////////////////////////////////////// QVariant rawValue( const QModelIndex& index) const override; - QVariant roleValue( - const QModelIndex& index, - QVariant&& rawValue, - int role) const override; bool setTrackValueForColumn( const TrackPointer& pTrack, diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp index cb226a7ea7..85f6a3df9f 100644 --- a/src/library/basetrackcache.cpp +++ b/src/library/basetrackcache.cpp @@ -3,13 +3,14 @@ #include "library/basetrackcache.h" -#include "library/trackcollection.h" -#include "library/searchqueryparser.h" #include "library/queryutil.h" -#include "track/keyutils.h" +#include "library/searchqueryparser.h" +#include "library/trackcollection.h" #include "track/globaltrackcache.h" -#include "util/performancetimer.h" +#include "track/keyutils.h" +#include "track/track.h" #include "util/compatibility.h" +#include "util/performancetimer.h" namespace { diff --git a/src/library/basetrackcache.h b/src/library/basetrackcache.h index 81c542d975..64b346312e 100644 --- a/src/library/basetrackcache.h +++ b/src/library/basetrackcache.h @@ -1,18 +1,18 @@ #pragma once +#include <QHash> #include <QList> #include <QObject> #include <QSet> -#include <QHash> +#include <QSqlDatabase> #include <QString> #include <QStringList> -#include <QSqlDatabase> #include <QVector> - #include <memory> #include "library/columncache.h" -#include "track/track.h" +#include "track/track_decl.h" +#include "track/trackid.h" #include "util/class.h" #include "util/string.h" diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp index 6d958f1f68..e7790b2434 100644 --- a/src/library/basetracktablemodel.cpp +++ b/src/library/basetracktablemodel.cpp @@ -500,9 +500,8 @@ QVariant BaseTrackTableModel::roleValue( return QVariant(); } return QString("(%1)").arg(rawValue.toInt()); - } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED)) { - return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); - } else if (column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { + } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED) || + column == fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED)) { return mixxx::localDateTimeFromUtc(mixxx::convertVariantToDateTime(rawValue)); } else if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_BPM)) { bool ok; diff --git a/src/library/basetracktablemodel.h b/src/library/basetracktablemodel.h index 9228edd2be..bd7dacff62 100644 --- a/src/library/basetracktablemodel.h +++ b/src/library/basetracktablemodel.h @@ -7,6 +7,7 @@ #include "library/columncache.h" #include "library/trackmodel.h" +#include "track/track.h" class BaseCoverArtDelegate; class TrackCollectionManager; diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp index 597a197cd7..8525e2e991 100644 --- a/src/library/browse/browsetablemodel.cpp +++ b/src/library/browse/browsetablemodel.cpp @@ -15,6 +15,7 @@ #include "library/trackcollectionmanager.h" #include "mixer/playerinfo.h" #include "mixer/playermanager.h" +#include "track/track.h" #include "util/compatibility.h" #include "widget/wlibrarytableview.h" diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp index 7f492e2890..84e2c96af9 100644 --- a/src/library/browse/browsethread.cpp +++ b/src/library/browse/browsethread.cpp @@ -2,18 +2,17 @@ * browsethread.cpp (C) 2011 Tobias Rafreider */ -#include <QtDebug> -#include <QStringList> #include <QDateTime> #include <QDirIterator> +#include <QStringList> +#include <QtDebug> #include "library/browse/browsetablemodel.h" - #include "sources/soundsourceproxy.h" +#include "track/track.h" #include "util/datetime.h" #include "util/trace.h" - QWeakPointer<BrowseThread> BrowseThread::m_weakInstanceRef; static QMutex s_Mutex; diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp index 85620cdd87..db06332155 100644 --- a/src/library/coverart.cpp +++ b/src/library/coverart.cpp @@ -3,6 +3,7 @@ #include <QDebugStateSaver> #include "library/coverartutils.h" +#include "track/track.h" #include "util/debug.h" #include "util/logger.h" diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h index 22ab59a005..4e132ee07e 100644 --- a/src/library/coverartcache.h +++ b/src/library/coverartcache.h @@ -7,8 +7,8 @@ #include <QtDebug> #include "library/coverart.h" +#include "track/track_decl.h" #include "util/singleton.h" -#include "track/track.h" class CoverArtCache : public QObject, public Singleton<CoverArtCache> { Q_OBJECT diff --git a/src/library/coverartutils.cpp b/src/library/coverartutils.cpp index 5ff6ae2d7a..af3b3b3184 100644 --- a/src/library/coverartutils.cpp +++ b/src/library/coverartutils.cpp @@ -5,6 +5,7 @@ #include <QtConcurrentRun> #include "sources/soundsourceproxy.h" +#include "track/track.h" #include "util/compatibility.h" #include "util/logger.h" #include "util/regex.h" diff --git a/src/library/coverartutils.h b/src/library/coverartutils.h index b185dcfde3..5275797031 100644 --- a/src/library/coverartutils.h +++ b/src/library/coverartutils.h @@ -1,18 +1,18 @@ #pragma once +#include <QFileInfo> #include <QImage> +#include <QList> +#include <QSize> #include <QString> #include <QStringList> -#include <QSize> -#include <QFileInfo> -#include <QList> #include "track/track.h" #include "util/sandbox.h" class CoverInfo; class CoverInfoRelative; - +class TrackFile; class CoverArtUtils { public: diff --git a/src/library/crate/cratefeature.h b/src/library/crate/cratefeature.h index 1692260ce3..9461a5dd17 100644 --- a/src/library/crate/cratefeature.h +++ b/src/library/crate/cratefeature.h @@ -1,23 +1,20 @@ #pragma once -#include <QModelIndex> -#include <QList> #include <QAction> -#include <QVariant> -#include <QUrl> #include <QIcon> +#include <QList> +#include <QModelIndex> #include <QPoint> #include <QPointer> +#include <QUrl> +#include <QVariant> +#include "library/basetracksetfeature.h" #include "library/crate/cratestorage.h" #include "library/crate/cratetablemodel.h" -#include "library/basetracksetfeature.h" #include "library/treeitemmodel.h" - -#include "track/track.h" - #include "preferences/usersettings.h" - +#include "track/track_decl.h" #include "util/parented_ptr.h" // forward declaration(s) diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp index 58809c2baa..9ca5b4284b 100644 --- a/src/library/dao/autodjcratesdao.cpp +++ b/src/library/dao/autodjcratesdao.cpp @@ -14,6 +14,7 @@ #include "library/trackcollection.h" #include "mixer/playerinfo.h" #include "mixer/playermanager.h" +#include "track/track.h" #define AUTODJCRATESTABLE_TRACKID "track_id" #define AUTODJCRATESTABLE_CRATEREFS "craterefs" diff --git a/src/library/dao/autodjcratesdao.h b/src/library/dao/autodjcratesdao.h index 2aeb73096a..35e45678ff 100644 --- a/src/library/dao/autodjcratesdao.h +++ b/src/library/dao/autodjcratesdao.h @@ -3,9 +3,10 @@ #include <QObject> #include <QSqlDatabase> -#include "preferences/usersettings.h" #include "library/crate/crateid.h" -#include "track/track.h" +#include "preferences/usersettings.h" +#include "track/track_decl.h" +#include "track/trackid.h" #include "util/class.h" class TrackCollection; diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp index 2cba410bcd..f8c8740f6d 100644 --- a/src/library/dao/cuedao.cpp +++ b/src/library/dao/cuedao.cpp @@ -8,7 +8,6 @@ #include <QtSql> #include "library/queryutil.h" -#include "track/cue.h" #include "track/track.h" #include "util/assert.h" #include "util/color/rgbcolor.h" diff --git a/src/library/dao/cuedao.h b/src/library/dao/cuedao.h index d38d63820a..68a0a66816 100644 --- a/src/library/dao/cuedao.h +++ b/src/library/dao/cuedao.h @@ -2,8 +2,9 @@ #include <QSqlDatabase> -#include "track/track.h" #include "library/dao/dao.h" +#include "track/cue.h" +#include "track/trackid.h" #define CUE_TABLE "cues" diff --git a/src/library/dlgcoverartfullsize.cpp b/src/library/dlgcoverartfullsize.cpp index 623fc4a436..02f8ca3212 100644 --- a/src/library/dlgcoverartfullsize.cpp +++ b/src/library/dlgcoverartfullsize.cpp @@ -247,8 +247,8 @@ void DlgCoverArtFullSize::wheelEvent(QWheelEvent* event) { // Scale the image size int oldWidth = width(); int oldHeight = height(); - int newWidth = oldWidth + (0.2 * event->angleDelta().y()); - int newHeight = oldHeight + (0.2 * event->angleDelta().y()); + auto newWidth = static_cast<int>(oldWidth + (0.2 * event->angleDelta().y())); + auto newHeight = static_cast<int>(oldHeight + (0.2 * event->angleDelta().y())); QSize newSize = size(); newSize.scale(newWidth, newHeight, Qt::KeepAspectRatio); @@ -261,8 +261,10 @@ void DlgCoverArtFullSize::wheelEvent(QWheelEvent* event) { QPoint oldPointUnderCursor = event->pos(); #endif - int newPointX = (double) oldPointUnderCursor.x() / oldWidth * newSize.width(); - int newPointY = (double) oldPointUnderCursor.y() / oldHeight * newSize.height(); + const auto newPointX = static_cast<int>( + static_cast<double>(oldPointUnderCursor.x()) / oldWidth * newSize.width()); + const auto newPointY = static_cast<int>( + static_cast<double>(oldPointUnderCursor.y()) / oldHeight * newSize.height()); QPoint newOrigin = QPoint( oldOrigin.x() + (oldPointUnderCursor.x() - newPointX), oldOrigin.y() + (oldPointUnderCursor.y() - newPointY)); diff --git a/src/library/dlgcoverartfullsize.h b/src/library/dlgcoverartfullsize.h index 7ae2a7ba71..7b168e8dca 100644 --- a/src/library/dlgcoverartfullsize.h +++ b/src/library/dlgcoverartfullsize.h @@ -1,15 +1,15 @@ #pragma once #include <QDialog> -#include <QTimer> #include <QPoint> +#include <QTimer> -#include "library/ui_dlgcoverartfullsize.h" #include "library/coverart.h" +#include "library/ui_dlgcoverartfullsize.h" #include "mixer/basetrackplayer.h" -#include "track/track.h" -#include "widget/wcoverartmenu.h" +#include "track/track_decl.h" #include "util/parented_ptr.h" +#include "widget/wcoverartmenu.h" class DlgCoverArtFullSize : public QDialog, diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp index de21685bfe..c5747401a1 100644 --- a/src/library/dlgtagfetcher.cpp +++ b/src/library/dlgtagfetcher.cpp @@ -3,6 +3,7 @@ #include <QTreeWidget> #include <QtDebug> +#include "track/track.h" #include "track/tracknumbers.h" namespace { diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h index 006f6ad00d..b50c611781 100644 --- a/src/library/dlgtagfetcher.h +++ b/src/library/dlgtagfetcher.h @@ -7,7 +7,7 @@ #include "library/trackmodel.h" #include "library/ui_dlgtagfetcher.h" #include "musicbrainz/tagfetcher.h" -#include "track/track.h" +#include "track/track_decl.h" /// A dialog box to fetch track metadata from MusicBrainz. /// Use TrackPointer to load a track into the dialog or diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp index 4f8e1e9c1b..917b96b46f 100644 --- a/src/library/dlgtrackinfo.cpp +++ b/src/library/dlgtrackinfo.cpp @@ -11,9 +11,9 @@ #include "preferences/colorpalettesettings.h" #include "sources/soundsourceproxy.h" #include "track/beatfactory.h" -#include "track/cue.h" #include "track/keyfactory.h" #include "track/keyutils.h" +#include "track/track.h" #include "util/color/colorpalette.h" #include "util/compatibility.h" #include "util/datetime.h" diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h index e7f1d2a5cb..6429fb630a 100644 --- a/src/library/dlgtrackinfo.h +++ b/src/library/dlgtrackinfo.h @@ -6,7 +6,10 @@ #include "library/coverart.h" #include "library/ui_dlgtrackinfo.h" -#include "track/track.h" +#include "track/beats.h" +#include "track/keys.h" +#include "track/track_decl.h" +#include "track/trackid.h" #include "util/parented_ptr.h" #include "util/tapfilter.h" diff --git a/src/library/export/trackexportdlg.h b/src/library/export/trackexportdlg.h index e7f9529002..3598935d0e 100644 --- a/src/library/export/trackexportdlg.h +++ b/src/library/export/trackexportdlg.h @@ -1,16 +1,15 @@ #ifndef DLGTRACKEXPORT_H #define DLGTRACKEXPORT_H -#include <future> - #include <QDialog> -#include <QString> #include <QScopedPointer> +#include <QString> +#include <future> -#include "preferences/usersettings.h" #include "library/export/trackexportworker.h" #include "library/export/ui_dlgtrackexport.h" -#include "track/track.h" +#include "preferences/usersettings.h" +#include "track/track_decl.h" // A dialog for interacting with the track exporter in an interactive manner. // |