Make the fp settings controller static

Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Sep 4, 2023 · 9f4f1ac · 9f4f1ac
1 parent 62e85b3
commit 9f4f1ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -177,7 +177,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
 
 #if defined(BUILD_FILE_PROVIDER_MODULE)
     if (Mac::FileProvider::fileProviderAvailable()) {
-        const auto fpSettingsWidget = _fpSettingsController.settingsViewWidget();
+        const auto fpSettingsWidget = Mac::FileProviderSettingsController::instance()->settingsViewWidget();
         const auto fpSettingsLayout = new QVBoxLayout(_ui->fileProviderTab);
         fpSettingsLayout->setMargin(0);
         fpSettingsLayout->addWidget(fpSettingsWidget);

diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h
@@ -154,10 +154,6 @@ private slots:
     bool _menuShown = false;
 
     QHash<QString, QMetaObject::Connection> _folderConnections;
-
-#ifdef BUILD_FILE_PROVIDER_MODULE
-    Mac::FileProviderSettingsController _fpSettingsController;
-#endif
 };
 
 } // namespace OCC

diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller.h b/src/gui/macOS/ui/fileprovidersettingscontroller.h
@@ -26,12 +26,14 @@ class FileProviderSettingsController : public QObject
     Q_OBJECT
 
 public:
-    explicit FileProviderSettingsController(QObject *parent = nullptr);
-    ~FileProviderSettingsController() override;
+    static FileProviderSettingsController *instance();
 
     [[nodiscard]] QQuickWidget *settingsViewWidget();
 
 private:
+    explicit FileProviderSettingsController(QObject *parent = nullptr);
+    ~FileProviderSettingsController() override;
+
     void instantiateSettingsWidget();
 
     class MacImplementation;

diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller_mac.mm b/src/gui/macOS/ui/fileprovidersettingscontroller_mac.mm
@@ -54,6 +54,12 @@
     NSUserDefaults *_userDefaults = nil;
 };
 
+FileProviderSettingsController *FileProviderSettingsController::instance()
+{
+    static FileProviderSettingsController controller;
+    return &controller;
+}
+
 FileProviderSettingsController::~FileProviderSettingsController() = default;
 
 FileProviderSettingsController::FileProviderSettingsController(QObject *parent)