diff --git a/src/app/pluginadapter.cpp b/src/app/pluginadapter.cpp index f5bd1ab37b4337fc9f65877868e749326a721c42..1ca2c4065397396ac1db728fcc3b4e1291f4284e 100644 --- a/src/app/pluginadapter.cpp +++ b/src/app/pluginadapter.cpp @@ -24,7 +24,6 @@ #include "networkmanager.h" #include "lrcinstance.h" #include "appsettingsmanager.h" -#include "utilsadapter.h" #include "qmlregister.h" #include <QJsonArray> @@ -40,7 +39,7 @@ PluginAdapter::PluginAdapter(LRCInstance* instance, QString baseUrl) : QmlAdapterBase(instance, parent) , pluginStoreListModel_(new PluginStoreListModel(instance, this)) - , pluginVersionManager_(new PluginVersionManager(instance, this)) + , pluginVersionManager_(new PluginVersionManager(instance, settingsManager, this)) , pluginListModel_(new PluginListModel(instance, this)) , lrcInstance_(instance) , settingsManager_(settingsManager) diff --git a/src/app/pluginversionmanager.cpp b/src/app/pluginversionmanager.cpp index 1e4e5a9f476d9e092cb0639b90b21abc0a6ae163..20daa5cbc507a54fa30d8355298f4053fba41712 100644 --- a/src/app/pluginversionmanager.cpp +++ b/src/app/pluginversionmanager.cpp @@ -32,10 +32,10 @@ static constexpr int updatePeriod = 1000 * 60 * 60 * 24; // one day in millis struct PluginVersionManager::Impl : public QObject { public: - Impl(LRCInstance* instance, PluginVersionManager& parent) + Impl(LRCInstance* instance, AppSettingsManager* settingsManager, PluginVersionManager& parent) : QObject(nullptr) , parent_(parent) - , settingsManager_(new AppSettingsManager(this)) + , settingsManager_(settingsManager) , lrcInstance_(instance) , updateTimer_(new QTimer(this)) { @@ -164,9 +164,11 @@ public: QTimer* updateTimer_; }; -PluginVersionManager::PluginVersionManager(LRCInstance* instance, QObject* parent) +PluginVersionManager::PluginVersionManager(LRCInstance* instance, + AppSettingsManager* settingsManager, + QObject* parent) : NetworkManager(&instance->connectivityMonitor(), parent) - , pimpl_(std::make_unique<Impl>(instance, *this)) + , pimpl_(std::make_unique<Impl>(instance, settingsManager, *this)) {} PluginVersionManager::~PluginVersionManager() @@ -241,4 +243,4 @@ PluginVersionManager::checkVersion(const QString& installedVersion, } } return false; -} \ No newline at end of file +} diff --git a/src/app/pluginversionmanager.h b/src/app/pluginversionmanager.h index 34a406dc6685861e2d1f36b66e5ae15c643e09df..127f411b238881688fd1cff0f34807fcbfb0aadd 100644 --- a/src/app/pluginversionmanager.h +++ b/src/app/pluginversionmanager.h @@ -22,6 +22,7 @@ class QString; class LRCInstance; +class AppSettingsManager; #define PLUGIN_STATUS_ROLES \ X(INSTALLABLE) \ @@ -46,7 +47,9 @@ class PluginVersionManager final : public NetworkManager { Q_OBJECT public: - explicit PluginVersionManager(LRCInstance* instance, QObject* parent = nullptr); + explicit PluginVersionManager(LRCInstance* instance, + AppSettingsManager* settingsManager, + QObject* parent = nullptr); ~PluginVersionManager(); Q_INVOKABLE bool isAutoUpdaterEnabled();