From 623026f42066be41790b2625b334f9a3b3912f04 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 19 Aug 2017 15:47:48 -0700 Subject: [PATCH] Connect to Settings::PathAdded/Removed directly in GameListModel It no longer makes sense to connect these signals in GameList, since GameListModel is now owned by Settings. --- Source/Core/DolphinQt2/GameList/GameList.cpp | 2 -- Source/Core/DolphinQt2/GameList/GameListModel.cpp | 4 ++-- Source/Core/DolphinQt2/GameList/GameListModel.h | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp index 3e71ac7aa8..c51708980e 100644 --- a/Source/Core/DolphinQt2/GameList/GameList.cpp +++ b/Source/Core/DolphinQt2/GameList/GameList.cpp @@ -49,8 +49,6 @@ GameList::GameList(QWidget* parent) : QStackedWidget(parent) connect(m_list, &QTableView::doubleClicked, this, &GameList::GameSelected); connect(m_grid, &QListView::doubleClicked, this, &GameList::GameSelected); - connect(&Settings::Instance(), &Settings::PathAdded, m_model, &GameListModel::DirectoryAdded); - connect(&Settings::Instance(), &Settings::PathRemoved, m_model, &GameListModel::DirectoryRemoved); connect(m_model, &QAbstractItemModel::rowsInserted, this, &GameList::ConsiderViewChange); connect(m_model, &QAbstractItemModel::rowsRemoved, this, &GameList::ConsiderViewChange); diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.cpp b/Source/Core/DolphinQt2/GameList/GameListModel.cpp index 44561c7f1e..0cf62c92e0 100644 --- a/Source/Core/DolphinQt2/GameList/GameListModel.cpp +++ b/Source/Core/DolphinQt2/GameList/GameListModel.cpp @@ -14,8 +14,8 @@ GameListModel::GameListModel(QObject* parent) : QAbstractTableModel(parent) { connect(&m_tracker, &GameTracker::GameLoaded, this, &GameListModel::UpdateGame); connect(&m_tracker, &GameTracker::GameRemoved, this, &GameListModel::RemoveGame); - connect(this, &GameListModel::DirectoryAdded, &m_tracker, &GameTracker::AddDirectory); - connect(this, &GameListModel::DirectoryRemoved, &m_tracker, &GameTracker::RemoveDirectory); + connect(&Settings::Instance(), &Settings::PathAdded, &m_tracker, &GameTracker::AddDirectory); + connect(&Settings::Instance(), &Settings::PathRemoved, &m_tracker, &GameTracker::RemoveDirectory); for (const QString& dir : Settings::Instance().GetPaths()) m_tracker.AddDirectory(dir); diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.h b/Source/Core/DolphinQt2/GameList/GameListModel.h index 1230573d98..7e3d926f86 100644 --- a/Source/Core/DolphinQt2/GameList/GameListModel.h +++ b/Source/Core/DolphinQt2/GameList/GameListModel.h @@ -48,10 +48,6 @@ public: void UpdateGame(QSharedPointer game); void RemoveGame(const QString& path); -signals: - void DirectoryAdded(const QString& dir); - void DirectoryRemoved(const QString& dir); - private: // Index in m_games, or -1 if it isn't found int FindGame(const QString& path) const;