diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-11-15 12:30:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-15 12:30:02 +0100 |
commit | 01b80f5718bc2db6b75ac4304431fa1520324e86 (patch) | |
tree | 9f5966c9acffa444134e2a8de252014e0f98ac45 /src/library/dao | |
parent | 894cb670f6afa18e725bc3fa1d63e10ee59ad903 (diff) | |
parent | 4b3c2b457cabed13434ac0febb46d701ed9a416d (diff) |
Merge pull request #3321 from uklotzde/fix_typos
Fix "Mixx" typos in code
Diffstat (limited to 'src/library/dao')
-rw-r--r-- | src/library/dao/playlistdao.cpp | 2 | ||||
-rw-r--r-- | src/library/dao/trackdao.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp index b4226ba9a8..c6650a7c1c 100644 --- a/src/library/dao/playlistdao.cpp +++ b/src/library/dao/playlistdao.cpp @@ -989,7 +989,7 @@ void PlaylistDAO::shuffleTracks(const int playlistId, const QList<int>& position // TODO: The following use of QList<T>::swap(int, int) is deprecated // and should be replaced with QList<T>::swapItemsAt(int, int) // However, the proposed alternative has just been introduced in Qt - // 5.13. Until the minimum required Qt version of Mixx is increased, + // 5.13. Until the minimum required Qt version of Mixxx is increased, // we need a version check here. #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0)) newPositions.swap(newPositions.indexOf(trackAPosition), diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index 77eed031d7..4f8ab1dbf6 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -750,7 +750,7 @@ void TrackDAO::afterHidingTracks( // TODO: QSet<T>::fromList(const QList<T>&) is deprecated and should be // replaced with QSet<T>(list.begin(), list.end()). // However, the proposed alternative has just been introduced in Qt - // 5.14. Until the minimum required Qt version of Mixx is increased, + // 5.14. Until the minimum required Qt version of Mixxx is increased, // we need a version check here #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) emit tracksRemoved(QSet<TrackId>(trackIds.begin(), trackIds.end())); @@ -783,7 +783,7 @@ void TrackDAO::afterUnhidingTracks( // TODO: QSet<T>::fromList(const QList<T>&) is deprecated and should be // replaced with QSet<T>(list.begin(), list.end()). // However, the proposed alternative has just been introduced in Qt - // 5.14. Until the minimum required Qt version of Mixx is increased, + // 5.14. Until the minimum required Qt version of Mixxx is increased, // we need a version check here #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) emit tracksAdded(QSet<TrackId>(trackIds.begin(), trackIds.end())); @@ -902,7 +902,7 @@ void TrackDAO::afterPurgingTracks( // TODO: QSet<T>::fromList(const QList<T>&) is deprecated and should be // replaced with QSet<T>(list.begin(), list.end()). // However, the proposed alternative has just been introduced in Qt - // 5.14. Until the minimum required Qt version of Mixx is increased, + // 5.14. Until the minimum required Qt version of Mixxx is increased, // we need a version check here #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QSet<TrackId> tracksRemovedSet = QSet<TrackId>(trackIds.begin(), trackIds.end()); |