3 files changed, 51 insertions, 35 deletions

diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp
index b5757e226b..b5c20f836d 100644
--- a/src/library/browse/browsefeature.cpp
+++ b/src/library/browse/browsefeature.cpp
@@ -1,32 +1,32 @@
 // browsefeature.cpp
 // Created 9/8/2009 by RJ Ryan (rryan@mit.edu)
 
-#include <QStringList>
-#include <QTreeView>
+#include <QAction>
 #include <QDirModel>
-#include <QStringList>
 #include <QFileInfo>
-#include <QStandardPaths>
-#include <QAction>
 #include <QMenu>
 #include <QPushButton>
+#include <QStandardPaths>
+#include <QStringList>
+#include <QTreeView>
 
-#include "track/track.h"
-#include "library/treeitem.h"
+#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/browse/browsefeature.h"
+#include "library/library.h"
 #include "library/trackcollection.h"
-#include "widget/wlibrarytextbrowser.h"
-#include "widget/wlibrary.h"
-#include "controllers/keyboard/keyboardeventfilter.h"
-#include "util/sandbox.h"
+#include "library/treeitem.h"
+#include "track/track.h"
 #include "util/memory.h"
+#include "util/sandbox.h"
+#include "widget/wlibrary.h"
+#include "widget/wlibrarytextbrowser.h"
 
 const QString kQuickLinksSeparator = "-+-";
 
-BrowseFeature::BrowseFeature(QObject* parent,
-                             UserSettingsPointer pConfig,
-                             TrackCollection* pTrackCollection,
-                             RecordingManager* pRecordingManager)
+BrowseFeature::BrowseFeature(Library* parent,
+        UserSettingsPointer pConfig,
+        TrackCollection* pTrackCollection,
+        RecordingManager* pRecordingManager)
         : LibraryFeature(parent),
           m_pConfig(pConfig),
           m_browseModel(this, pTrackCollection, pRecordingManager),
@@ -34,18 +34,28 @@ BrowseFeature::BrowseFeature(QObject* parent,
           m_pTrackCollection(pTrackCollection),
           m_pLastRightClickedItem(NULL),
           m_icon(":/images/library/ic_library_computer.svg") {
-    connect(this, SIGNAL(requestAddDir(QString)),
-            parent, SLOT(slotRequestAddDir(QString)));
+    connect(this,
+            &BrowseFeature::requestAddDir,
+            parent,
+            &Library::slotRequestAddDir);
 
     m_pAddQuickLinkAction = new QAction(tr("Add to Quick Links"),this);
-    connect(m_pAddQuickLinkAction, SIGNAL(triggered()), this, SLOT(slotAddQuickLink()));
+    connect(m_pAddQuickLinkAction,
+            &QAction::triggered,
+            this,
+            &BrowseFeature::slotAddQuickLink);
 
     m_pRemoveQuickLinkAction = new QAction(tr("Remove from Quick Links"),this);
-    connect(m_pRemoveQuickLinkAction, SIGNAL(triggered()), this, SLOT(slotRemoveQuickLink()));
+    connect(m_pRemoveQuickLinkAction,
+            &QAction::triggered,
+            this,
+            &BrowseFeature::slotRemoveQuickLink);
 
     m_pAddtoLibraryAction = new QAction(tr("Add to Library"),this);
-    connect(m_pAddtoLibraryAction, SIGNAL(triggered()),
-            this, SLOT(slotAddToLibrary()));
+    connect(m_pAddtoLibraryAction,
+            &QAction::triggered,
+            this,
+            &BrowseFeature::slotAddToLibrary);
 
     m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_proxyModel.setSortCaseSensitivity(Qt::CaseInsensitive);
diff --git a/src/library/browse/browsefeature.h b/src/library/browse/browsefeature.h
index a414614759..76994191bc 100644
--- a/src/library/browse/browsefeature.h
+++ b/src/library/browse/browsefeature.h
@@ -22,15 +22,16 @@
 #define QUICK_LINK_NODE "::mixxx_quick_lnk_node::"
 #define DEVICE_NODE "::mixxx_device_node::"
 
+class Library;
 class TrackCollection;
 
 class BrowseFeature : public LibraryFeature {
     Q_OBJECT
   public:
-    BrowseFeature(QObject* parent,
-                  UserSettingsPointer pConfig,
-                  TrackCollection* pTrackCollection,
-                  RecordingManager* pRec);
+    BrowseFeature(Library* parent,
+            UserSettingsPointer pConfig,
+            TrackCollection* pTrackCollection,
+            RecordingManager* pRecordingManager);
     virtual ~BrowseFeature();
 
     QVariant title();
diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index abd06a574f..a7a7d52df2 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -6,13 +6,14 @@
 #include <QUrl>
 #include <QTableView>
 
+#include "control/controlobject.h"
 #include "library/browse/browsetablemodel.h"
 #include "library/browse/browsethread.h"
+#include "library/dao/trackdao.h"
 #include "library/previewbuttondelegate.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
-#include "control/controlobject.h"
-#include "library/dao/trackdao.h"
+#include "widget/wlibrarytableview.h"
 
 BrowseTableModel::BrowseTableModel(QObject* parent,
                                    TrackCollection* pTrackCollection,
@@ -103,18 +104,22 @@ BrowseTableModel::BrowseTableModel(QObject* parent,
     qRegisterMetaType<BrowseTableModel*>("BrowseTableModel*");
 
     m_pBrowseThread = BrowseThread::getInstanceRef();
-    connect(m_pBrowseThread.data(), SIGNAL(clearModel(BrowseTableModel*)),
-            this, SLOT(slotClear(BrowseTableModel*)),
+    connect(m_pBrowseThread.data(),
+            &BrowseThread::clearModel,
+            this,
+            &BrowseTableModel::slotClear,
             Qt::QueuedConnection);
 
     connect(m_pBrowseThread.data(),
-            SIGNAL(rowsAppended(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
+            &BrowseThread::rowsAppended,
             this,
-            SLOT(slotInsert(const QList< QList<QStandardItem*> >&, BrowseTableModel*)),
+            &BrowseTableModel::slotInsert,
             Qt::QueuedConnection);
 
-    connect(&PlayerInfo::instance(), SIGNAL(trackLoaded(QString, TrackPointer)),
-            this, SLOT(trackLoaded(QString, TrackPointer)));
+    connect(&PlayerInfo::instance(),
+            &PlayerInfo::trackLoaded,
+            this,
+            &BrowseTableModel::trackLoaded);
     trackLoaded(m_previewDeckGroup, PlayerInfo::instance().getTrackInfo(m_previewDeckGroup));
 }
 
@@ -413,10 +418,10 @@ bool BrowseTableModel::isColumnSortable(int column) {
 }
 
 QAbstractItemDelegate* BrowseTableModel::delegateForColumn(const int i, QObject* pParent) {
-    QTableView* pTableView = qobject_cast<QTableView*>(pParent);
+    WLibraryTableView* pTableView = qobject_cast<WLibraryTableView*>(pParent);
     DEBUG_ASSERT(pTableView);
     if (PlayerManager::numPreviewDecks() > 0 && i == COLUMN_PREVIEW) {
         return new PreviewButtonDelegate(pTableView, i);
     }
-    return NULL;
+    return nullptr;
 }