summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2020-06-23 09:32:32 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2020-06-23 09:32:32 +0200
commit90d3fa5096227cab4e5f8f676009f6b307afc1ae (patch)
treea4f70e090a8c3c79e7755b56c5100b10778803b8
parent29565ca03ed338fed943f59fc04756874861f72b (diff)
Improve code style and fix typo
-rw-r--r--src/widget/wcoverart.cpp2
-rw-r--r--src/widget/wtrackproperty.cpp2
-rw-r--r--src/widget/wtracktext.cpp2
-rw-r--r--src/widget/wtrackwidgetgroup.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 803d090fa7..0ef60770ab 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -272,7 +272,7 @@ void WCoverArt::mouseReleaseEvent(QMouseEvent* event) {
}
void WCoverArt::mouseMoveEvent(QMouseEvent* event) {
- if ((event->buttons() & Qt::LeftButton) && m_loadedTrack) {
+ if ((event->buttons().testFlag(Qt::LeftButton)) && m_loadedTrack) {
DragAndDropHelper::dragTrack(m_loadedTrack, this, m_group);
}
}
diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
index 715fae0179..5f10ddaa8c 100644
--- a/src/widget/wtrackproperty.cpp
+++ b/src/widget/wtrackproperty.cpp
@@ -80,7 +80,7 @@ void WTrackProperty::updateLabel() {
}
void WTrackProperty::mouseMoveEvent(QMouseEvent* event) {
- if ((event->buttons() & Qt::LeftButton) && m_pCurrentTrack) {
+ if ((event->buttons().testFlag(Qt::LeftButton)) && m_pCurrentTrack) {
DragAndDropHelper::dragTrack(m_pCurrentTrack, this, m_group);
}
}
diff --git a/src/widget/wtracktext.cpp b/src/widget/wtracktext.cpp
index 1bf6d7999c..428034b73c 100644
--- a/src/widget/wtracktext.cpp
+++ b/src/widget/wtracktext.cpp
@@ -71,7 +71,7 @@ void WTrackText::updateLabel() {
}
void WTrackText::mouseMoveEvent(QMouseEvent *event) {
- if ((event->buttons() & Qt::LeftButton) && m_pCurrentTrack) {
+ if ((event->buttons().testFlag(Qt::LeftButton)) && m_pCurrentTrack) {
DragAndDropHelper::dragTrack(m_pCurrentTrack, this, m_group);
}
}
diff --git a/src/widget/wtrackwidgetgroup.cpp b/src/widget/wtrackwidgetgroup.cpp
index 5deb719e43..88c7bdf7fc 100644
--- a/src/widget/wtrackwidgetgroup.cpp
+++ b/src/widget/wtrackwidgetgroup.cpp
@@ -11,7 +11,7 @@
namespace {
-int kDefaultTrackColorAplha = 255;
+int kDefaultTrackColorAlpha = 255;
const WTrackMenu::Features kTrackMenuFeatures =
WTrackMenu::Feature::Playlist |
@@ -32,7 +32,7 @@ WTrackWidgetGroup::WTrackWidgetGroup(QWidget* pParent,
: WWidgetGroup(pParent),
m_group(group),
m_pConfig(pConfig),
- m_trackColorAlpha(kDefaultTrackColorAplha),
+ m_trackColorAlpha(kDefaultTrackColorAlpha),
m_pTrackMenu(make_parented<WTrackMenu>(
this, pConfig, pTrackCollectionManager, kTrackMenuFeatures)) {
setAcceptDrops(true);