From 4a5ff2f2320656366a4c931300626a68c49bd7b6 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Wed, 13 Jan 2021 12:59:57 +0100 Subject: Remove archive parsing attribute from core and use the one from settings directly. --- src/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f7ff7b04..70432377 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -486,7 +486,7 @@ MainWindow::MainWindow(Settings &settings ui->profileBox->setCurrentText(m_OrganizerCore.currentProfile()->name()); - if (m_OrganizerCore.getArchiveParsing()) + if (settings.archiveParsing()) { ui->dataTabShowFromArchives->setCheckState(Qt::Checked); ui->dataTabShowFromArchives->setEnabled(true); @@ -2455,6 +2455,7 @@ void MainWindow::on_actionSettings_triggered() QString oldProfilesDirectory(settings.paths().profiles()); QString oldManagedGameDirectory(settings.game().directory().value_or("")); bool oldDisplayForeign(settings.interface().displayForeign()); + bool oldArchiveParsing(settings.archiveParsing()); bool proxy = settings.network().useProxy(); DownloadManager *dlManager = m_OrganizerCore.downloadManager(); const bool oldCheckForUpdates = settings.checkForUpdates(); @@ -2516,9 +2517,8 @@ void MainWindow::on_actionSettings_triggered() } const auto state = settings.archiveParsing(); - if (state != m_OrganizerCore.getArchiveParsing()) + if (state != oldArchiveParsing) { - m_OrganizerCore.setArchiveParsing(state); if (!state) { ui->dataTabShowFromArchives->setCheckState(Qt::Unchecked); -- cgit v1.3.1 From 163b33f22817fda6ead29de8f9d9624434766be9 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Wed, 13 Jan 2021 13:00:34 +0100 Subject: Remove unused close() signal from OrganizerCore. Remove declarations without definitions. --- src/mainwindow.cpp | 1 - src/organizercore.h | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 70432377..c9824a24 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -436,7 +436,6 @@ MainWindow::MainWindow(Settings &settings connect(&m_PluginContainer, &PluginContainer::pluginUnregistered, this, &MainWindow::onPluginRegistrationChanged); connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled); - connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close); m_CheckBSATimer.setSingleShot(true); connect(&m_CheckBSATimer, SIGNAL(timeout()), this, SLOT(checkBSAList())); diff --git a/src/organizercore.h b/src/organizercore.h index 4ff375b7..e8b42609 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -386,16 +386,14 @@ public slots: signals: - /** - * @brief emitted after a mod has been installed - * @node this is currently only used for tutorials - */ + // emitted after a mod has been installed + // void modInstalled(const QString &modName); + // emitted when the managed game changes + // void managedGameChanged(MOBase::IPluginGame const *gamePlugin); - void close(); - // emitted when the profile is changed, before notifying plugins // // the new profile can be stored but the old one is temporary and @@ -412,13 +410,9 @@ private: void saveCurrentProfile(); void storeSettings(); - bool queryApi(QString &apiKey); - void updateModActiveState(int index, bool active); void updateModsActiveState(const QList &modIndices, bool active); - bool testForSteam(bool *found, bool *access); - bool createDirectory(const QString &path); QString oldMO1HookDll() const; -- cgit v1.3.1