From 6b1390f83727e968d6837d505f87dda69673a444 Mon Sep 17 00:00:00 2001 From: RJ Ryan Date: Wed, 27 Apr 2016 11:10:30 -0700 Subject: Move MixxxKeyboard to src/controllers/keyboard/ and rename to KeyboardEventFilter. --- src/library/recording/dlgrecording.cpp | 2 +- src/library/recording/dlgrecording.h | 4 ++-- src/library/recording/recordingfeature.cpp | 4 ++-- src/library/recording/recordingfeature.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/library/recording') diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp index ccc5c6ca90..019a4c32b1 100644 --- a/src/library/recording/dlgrecording.cpp +++ b/src/library/recording/dlgrecording.cpp @@ -10,7 +10,7 @@ DlgRecording::DlgRecording(QWidget* parent, UserSettingsPointer pConfig, Library* pLibrary, TrackCollection* pTrackCollection, - RecordingManager* pRecordingManager, MixxxKeyboard* pKeyboard) + RecordingManager* pRecordingManager, KeyboardEventFilter* pKeyboard) : QWidget(parent), m_pConfig(pConfig), m_pTrackCollection(pTrackCollection), diff --git a/src/library/recording/dlgrecording.h b/src/library/recording/dlgrecording.h index 8a0778d9bb..0f8db1f42a 100644 --- a/src/library/recording/dlgrecording.h +++ b/src/library/recording/dlgrecording.h @@ -7,7 +7,7 @@ #include "library/proxytrackmodel.h" #include "library/library.h" #include "library/trackcollection.h" -#include "mixxxkeyboard.h" +#include "controllers/keyboard/keyboardeventfilter.h" #include "recording/recordingmanager.h" #include "track/track.h" #include "library/recording/ui_dlgrecording.h" @@ -21,7 +21,7 @@ class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual Lib public: DlgRecording(QWidget *parent, UserSettingsPointer pConfig, Library* pLibrary, TrackCollection* pTrackCollection, - RecordingManager* pRecManager, MixxxKeyboard* pKeyboard); + RecordingManager* pRecManager, KeyboardEventFilter* pKeyboard); virtual ~DlgRecording(); virtual void onSearch(const QString& text); diff --git a/src/library/recording/recordingfeature.cpp b/src/library/recording/recordingfeature.cpp index 8d147da581..e3a3c0d8c3 100644 --- a/src/library/recording/recordingfeature.cpp +++ b/src/library/recording/recordingfeature.cpp @@ -8,7 +8,7 @@ #include "library/library.h" #include "library/trackcollection.h" #include "widget/wlibrary.h" -#include "mixxxkeyboard.h" +#include "controllers/keyboard/keyboardeventfilter.h" const QString RecordingFeature::m_sRecordingViewName = QString("Recording"); @@ -39,7 +39,7 @@ TreeItemModel* RecordingFeature::getChildModel() { return &m_childModel; } void RecordingFeature::bindWidget(WLibrary* pLibraryWidget, - MixxxKeyboard *keyboard) { + KeyboardEventFilter *keyboard) { //The view will be deleted by LibraryWidget DlgRecording* pRecordingView = new DlgRecording(pLibraryWidget, m_pConfig, diff --git a/src/library/recording/recordingfeature.h b/src/library/recording/recordingfeature.h index ae274e35e7..7ff7e43ac4 100644 --- a/src/library/recording/recordingfeature.h +++ b/src/library/recording/recordingfeature.h @@ -30,7 +30,7 @@ class RecordingFeature : public LibraryFeature { QIcon getIcon(); void bindWidget(WLibrary* libraryWidget, - MixxxKeyboard* keyboard); + KeyboardEventFilter* keyboard); TreeItemModel* getChildModel(); -- cgit v1.2.3