From 5f7bcf565d07125fba37909bfd2f03d79c769c75 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 8 Mar 2020 20:56:26 +0200
Subject: [PATCH] remove old code for activities in settings window

--remove relevant deprecated code that is not needed
in the new implementation
---
 app/settings/settingsdialog.cpp | 34 ++-------------------------------
 app/settings/settingsdialog.h   |  3 ---
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index df1332658..4705938ec 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -349,16 +349,6 @@ QString SettingsDialog::freeActivities_id() const
     return FREEACTIVITIESID;
 }
 
-QStringList SettingsDialog::activities()
-{
-    return m_corona->layoutsManager()->synchronizer()->activities();
-}
-
-QStringList SettingsDialog::availableActivities()
-{
-    return m_availableActivities;
-}
-
 QStringList SettingsDialog::activitiesList()
 {
     QStringList result;
@@ -1068,8 +1058,6 @@ void SettingsDialog::loadSettings()
         }
     }
 
-    recalculateAvailableActivities();
-
     m_model->setHorizontalHeaderItem(IDCOLUMN, new QStandardItem(QString("#path")));
     m_model->setHorizontalHeaderItem(COLORCOLUMN, new QStandardItem(QIcon::fromTheme("games-config-background"),
                                                                     QString(i18nc("column for layout background", "Background"))));
@@ -1361,8 +1349,7 @@ void SettingsDialog::itemChanged(QStandardItem *item)
     updatePerLayoutButtonsState();
 
     if (item->column() == ACTIVITYCOLUMN) {
-        //! recalculate the available activities
-        recalculateAvailableActivities();
+        //! do nothing
     } else if (item->column() == NAMECOLUMN) {
         int currentRow = ui->layoutsView->currentIndex().row();
 
@@ -1574,23 +1561,6 @@ void SettingsDialog::updateSharedLayoutsUiElements()
     }
 }
 
-void SettingsDialog::recalculateAvailableActivities()
-{
-    QStringList tempActivities = m_corona->layoutsManager()->synchronizer()->activities();
-
-    for (int i = 0; i < m_model->rowCount(); ++i) {
-        QStringList assigned = m_model->data(m_model->index(i, ACTIVITYCOLUMN), Qt::UserRole).toStringList();
-
-        for (const auto &activity : assigned) {
-            if (tempActivities.contains(activity)) {
-                tempActivities.removeAll(activity);
-            }
-        }
-    }
-
-    m_availableActivities = tempActivities;
-}
-
 bool SettingsDialog::dataAreAccepted()
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
@@ -1698,7 +1668,7 @@ bool SettingsDialog::saveAllChanges()
     m_corona->themeExtended()->setOutlineWidth(ui->outlineSpinBox->value());
 
     //! Update Layouts
-    QStringList knownActivities = activities();
+    QStringList knownActivities = m_corona->layoutsManager()->synchronizer()->activities();
 
     QTemporaryDir layoutTempDir;
 
diff --git a/app/settings/settingsdialog.h b/app/settings/settingsdialog.h
index 6d3cb9567..7b97953a2 100644
--- a/app/settings/settingsdialog.h
+++ b/app/settings/settingsdialog.h
@@ -84,9 +84,7 @@ public:
     QString freeActivities_icon() const;
     QString freeActivities_id() const;
 
-    QStringList activities();
     QStringList activitiesList();
-    QStringList availableActivities();
     QStringList availableSharesFor(int row);
 
     void requestImagesDialog(int row);
@@ -154,7 +152,6 @@ private:
 private:
     int m_currentFreeActivitiesLayout{-1};
 
-    QStringList m_availableActivities;
     QStringList m_tempDirectories;
     QStringList m_initLayoutPaths;