From f10b7657a3060cb650bbc69788c59446c5e9e629 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 5 Dec 2019 17:04:49 +0100 Subject: [aA]ddToAutoDJ instead of [sS]endToAutoDJ consistently in code base --- src/library/dlganalysis.cpp | 12 ++++++------ src/library/dlganalysis.h | 6 +++--- src/library/librarycontrol.cpp | 4 ++-- src/library/libraryview.h | 6 +++--- src/library/recording/dlgrecording.cpp | 12 ++++++------ src/library/recording/dlgrecording.h | 6 +++--- src/widget/wtracktableview.cpp | 24 ++++++++++++------------ src/widget/wtracktableview.h | 8 ++++---- 8 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp index a1484ede50..a51efb3c8d 100644 --- a/src/library/dlganalysis.cpp +++ b/src/library/dlganalysis.cpp @@ -113,17 +113,17 @@ void DlgAnalysis::loadSelectedTrackToGroup(QString group, bool play) { m_pAnalysisLibraryTableView->loadSelectedTrackToGroup(group, play); } -void DlgAnalysis::slotSendToAutoDJBottom() { +void DlgAnalysis::slotAddToAutoDJBottom() { // append to auto DJ - m_pAnalysisLibraryTableView->slotSendToAutoDJBottom(); + m_pAnalysisLibraryTableView->slotAddToAutoDJBottom(); } -void DlgAnalysis::slotSendToAutoDJTop() { - m_pAnalysisLibraryTableView->slotSendToAutoDJTop(); +void DlgAnalysis::slotAddToAutoDJTop() { + m_pAnalysisLibraryTableView->slotAddToAutoDJTop(); } -void DlgAnalysis::slotSendToAutoDJReplace() { - m_pAnalysisLibraryTableView->slotSendToAutoDJReplace(); +void DlgAnalysis::slotAddToAutoDJReplace() { + m_pAnalysisLibraryTableView->slotAddToAutoDJReplace(); } void DlgAnalysis::moveSelection(int delta) { diff --git a/src/library/dlganalysis.h b/src/library/dlganalysis.h index 7f8968effe..4035aada74 100644 --- a/src/library/dlganalysis.h +++ b/src/library/dlganalysis.h @@ -28,9 +28,9 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra bool hasFocus() const override; void loadSelectedTrack() override; void loadSelectedTrackToGroup(QString group, bool play) override; - void slotSendToAutoDJBottom() override; - void slotSendToAutoDJTop() override; - void slotSendToAutoDJReplace() override; + void slotAddToAutoDJBottom() override; + void slotAddToAutoDJTop() override; + void slotAddToAutoDJReplace() override; void moveSelection(int delta) override; inline const QString currentSearch() { return m_pAnalysisLibraryTableModel->currentSearch(); diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp index c819fa9f01..6d3dda9e53 100644 --- a/src/library/librarycontrol.cpp +++ b/src/library/librarycontrol.cpp @@ -357,7 +357,7 @@ void LibraryControl::slotAutoDjAddTop(double v) { if (!activeView) { return; } - activeView->slotSendToAutoDJTop(); + activeView->slotAddToAutoDJTop(); } } @@ -370,7 +370,7 @@ void LibraryControl::slotAutoDjAddBottom(double v) { if (!activeView) { return; } - activeView->slotSendToAutoDJBottom(); + activeView->slotAddToAutoDJBottom(); } } diff --git a/src/library/libraryview.h b/src/library/libraryview.h index 7be3d9d1e5..293b7b1db7 100644 --- a/src/library/libraryview.h +++ b/src/library/libraryview.h @@ -22,9 +22,9 @@ class LibraryView { // track. Does nothing otherwise. virtual void loadSelectedTrack() {}; - virtual void slotSendToAutoDJBottom() {}; - virtual void slotSendToAutoDJTop() {}; - virtual void slotSendToAutoDJReplace() {}; + virtual void slotAddToAutoDJBottom() {}; + virtual void slotAddToAutoDJTop() {}; + virtual void slotAddToAutoDJReplace() {}; // If applicable, requests that the LibraryView load the selected track to // the specified group. Does nothing otherwise. diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp index b6299c31db..82036eaa6d 100644 --- a/src/library/recording/dlgrecording.cpp +++ b/src/library/recording/dlgrecording.cpp @@ -109,16 +109,16 @@ void DlgRecording::loadSelectedTrack() { m_pTrackTableView->loadSelectedTrack(); } -void DlgRecording::slotSendToAutoDJBottom() { - m_pTrackTableView->slotSendToAutoDJBottom(); +void DlgRecording::slotAddToAutoDJBottom() { + m_pTrackTableView->slotAddToAutoDJBottom(); } -void DlgRecording::slotSendToAutoDJTop() { - m_pTrackTableView->slotSendToAutoDJTop(); +void DlgRecording::slotAddToAutoDJTop() { + m_pTrackTableView->slotAddToAutoDJTop(); } -void DlgRecording::slotSendToAutoDJReplace() { - m_pTrackTableView->slotSendToAutoDJReplace(); +void DlgRecording::slotAddToAutoDJReplace() { + m_pTrackTableView->slotAddToAutoDJReplace(); } void DlgRecording::loadSelectedTrackToGroup(QString group, bool play) { diff --git a/src/library/recording/dlgrecording.h b/src/library/recording/dlgrecording.h index 0851065d04..7b1781c629 100644 --- a/src/library/recording/dlgrecording.h +++ b/src/library/recording/dlgrecording.h @@ -28,9 +28,9 @@ class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual Lib void onShow() override; bool hasFocus() const override; void loadSelectedTrack() override; - void slotSendToAutoDJBottom() override; - void slotSendToAutoDJTop() override; - void slotSendToAutoDJReplace() override; + void slotAddToAutoDJBottom() override; + void slotAddToAutoDJTop() override; + void slotAddToAutoDJReplace() override; void loadSelectedTrackToGroup(QString group, bool play) override; void moveSelection(int delta) override; inline const QString currentSearch() { return m_proxyModel.currentSearch(); } diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 22c9867d7c..fbca458e00 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -467,15 +467,15 @@ void WTrackTableView::createActions( m_pAutoDJBottomAct = new QAction(tr("Add to Auto DJ Queue (bottom)"), this); connect(m_pAutoDJBottomAct, SIGNAL(triggered()), - this, SLOT(slotSendToAutoDJBottom())); + this, SLOT(slotAddToAutoDJBottom())); m_pAutoDJTopAct = new QAction(tr("Add to Auto DJ Queue (top)"), this); connect(m_pAutoDJTopAct, SIGNAL(triggered()), - this, SLOT(slotSendToAutoDJTop())); + this, SLOT(slotAddToAutoDJTop())); m_pAutoDJReplaceAct = new QAction(tr("Add to Auto DJ Queue (replace)"), this); connect(m_pAutoDJReplaceAct, SIGNAL(triggered()), - this, SLOT(slotSendToAutoDJReplace())); + this, SLOT(slotAddToAutoDJReplace())); m_pImportMetadataFromFileAct = new QAction(tr("Import From File Tags"), this); connect(m_pImportMetadataFromFileAct, SIGNAL(triggered()), @@ -617,10 +617,10 @@ void WTrackTableView::slotMouseDoubleClicked(const QModelIndex &index) { emit(loadTrack(pTrack)); } else if (doubleClickAction == DlgPrefLibrary::ADD_TO_AUTODJ_BOTTOM && modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) { - sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::BOTTOM); + addToAutoDJ(PlaylistDAO::AutoDJSendLoc::BOTTOM); } else if (doubleClickAction == DlgPrefLibrary::ADD_TO_AUTODJ_TOP && modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) { - sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::TOP); + addToAutoDJ(PlaylistDAO::AutoDJSendLoc::TOP); } } @@ -1435,17 +1435,17 @@ void WTrackTableView::loadSelectedTrackToGroup(QString group, bool play) { loadSelectionToGroup(group, play); } -void WTrackTableView::slotSendToAutoDJBottom() { +void WTrackTableView::slotAddToAutoDJBottom() { // append to auto DJ - sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::BOTTOM); + addToAutoDJ(PlaylistDAO::AutoDJSendLoc::BOTTOM); } -void WTrackTableView::slotSendToAutoDJTop() { - sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::TOP); +void WTrackTableView::slotAddToAutoDJTop() { + addToAutoDJ(PlaylistDAO::AutoDJSendLoc::TOP); } -void WTrackTableView::slotSendToAutoDJReplace() { - sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::REPLACE); +void WTrackTableView::slotAddToAutoDJReplace() { + addToAutoDJ(PlaylistDAO::AutoDJSendLoc::REPLACE); } QList WTrackTableView::getSelectedTrackIds() const { @@ -1504,7 +1504,7 @@ void WTrackTableView::setSelectedTracks(const QList& trackIds) { } -void WTrackTableView::sendToAutoDJ(PlaylistDAO::AutoDJSendLoc loc) { +void WTrackTableView::addToAutoDJ(PlaylistDAO::AutoDJSendLoc loc) { if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) { return; } diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h index 3cc167e337..a221142b46 100644 --- a/src/widget/wtracktableview.h +++ b/src/widget/wtracktableview.h @@ -53,9 +53,9 @@ class WTrackTableView : public WLibraryTableView { void slotMouseDoubleClicked(const QModelIndex &); void slotUnhide(); void slotPurge(); - void slotSendToAutoDJBottom() override; - void slotSendToAutoDJTop() override; - void slotSendToAutoDJReplace() override; + void slotAddToAutoDJBottom() override; + void slotAddToAutoDJTop() override; + void slotAddToAutoDJReplace() override; private slots: void slotRemove(); @@ -109,7 +109,7 @@ class WTrackTableView : public WLibraryTableView { private: - void sendToAutoDJ(PlaylistDAO::AutoDJSendLoc loc); + void addToAutoDJ(PlaylistDAO::AutoDJSendLoc loc); void showTrackInfo(QModelIndex index); void showDlgTagFetcher(QModelIndex index); void createActions(const QList& externalTrackCollections); -- cgit v1.2.3