diff options
| author | RJ Ryan <rryan@mixxx.org> | 2016-04-27 20:57:58 -0700 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2016-04-27 21:00:41 -0700 |
| commit | e59916caf72a256bb28b1722759a629c5cc9cf81 (patch) | |
| tree | 88bdffc1b577802ef69e7f423808491093919e58 /src/mixxxapplication.cpp | |
| parent | caee5a884aca657a2ee554f16254443fc6c54022 (diff) | |
Replace use of "slave" with "proxy" or "follower" everywhere.
Diffstat (limited to 'src/mixxxapplication.cpp')
| -rw-r--r-- | src/mixxxapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mixxxapplication.cpp b/src/mixxxapplication.cpp index 521c3beee1..543d3ef4cb 100644 --- a/src/mixxxapplication.cpp +++ b/src/mixxxapplication.cpp @@ -4,7 +4,7 @@ #include <QTouchEvent> #include "mixxxapplication.h" -#include "control/controlobjectslave.h" +#include "control/controlproxy.h" #include "mixxx.h" extern void qt_translateRawTouchEvent(QWidget *window, @@ -141,7 +141,7 @@ bool MixxxApplication::notify(QObject* target, QEvent* event) { bool MixxxApplication::touchIsRightButton() { if (!m_pTouchShift) { - m_pTouchShift = new ControlObjectSlave( + m_pTouchShift = new ControlProxy( "[Controls]", "touch_shift", this); } return (m_pTouchShift->get() != 0.0); |