diff options
author | Be <be@mixxx.org> | 2020-10-31 12:22:18 -0500 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-10-31 12:22:18 -0500 |
commit | 2d0c5d7c74c4c23653825ba38aaa97f4cbc44c4d (patch) | |
tree | a655a1b07c2735f49057e0a302d143f17f5cfe73 /src/mixxxapplication.h | |
parent | ca87f6a1c82f0a42263efd0019025cec92ee030b (diff) | |
parent | bc10901de823bed00e98f422f6cc22bc4e2fd19d (diff) |
Merge remote-tracking branch 'upstream/2.3' into main
Diffstat (limited to 'src/mixxxapplication.h')
-rw-r--r-- | src/mixxxapplication.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mixxxapplication.h b/src/mixxxapplication.h index 1348de29e2..a9a5a67524 100644 --- a/src/mixxxapplication.h +++ b/src/mixxxapplication.h @@ -11,13 +11,13 @@ class MixxxApplication : public QApplication { MixxxApplication(int& argc, char** argv); ~MixxxApplication() override = default; + bool notify(QObject*, QEvent*) override; + private: bool touchIsRightButton(); void registerMetaTypes(); - int m_fakeMouseSourcePointId; - QWidget* m_fakeMouseWidget; - enum Qt::MouseButton m_activeTouchButton; + int m_rightPressedButtons; ControlProxy* m_pTouchShift; }; |