From f607bfaca1e85e4da663669b9890eda9cd5dac3f Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 4 Sep 2023 14:11:54 +0800
Subject: [PATCH] Make file provider settings controller implementation an
 Objective-C++ file

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/CMakeLists.txt                                |  2 +-
 src/gui/macOS/ui/fileprovidersettingscontroller.h     |  2 --
 ...ller.cpp => fileprovidersettingscontroller_mac.mm} | 11 +++++------
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename src/gui/macOS/ui/{fileprovidersettingscontroller.cpp => fileprovidersettingscontroller_mac.mm} (87%)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 1516be57dc..f79d0dfd86 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -303,7 +303,7 @@ IF( APPLE )
             macOS/fileproviderxpc_mac_utils.h
             macOS/fileproviderxpc_mac_utils.mm
             macOS/ui/fileprovidersettingscontroller.h
-            macOS/ui/fileprovidersettingscontroller.cpp)
+            macOS/ui/fileprovidersettingscontroller_mac.mm)
     endif()
 
     if(SPARKLE_FOUND AND BUILD_UPDATER)
diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller.h b/src/gui/macOS/ui/fileprovidersettingscontroller.h
index 1d849597ca..7b70586470 100644
--- a/src/gui/macOS/ui/fileprovidersettingscontroller.h
+++ b/src/gui/macOS/ui/fileprovidersettingscontroller.h
@@ -25,8 +25,6 @@ class FileProviderSettingsController : public QObject
 {
     Q_OBJECT
 
-    //Q_PROPERTY(QQuickWidget* settingsViewWidget READ settingsViewWidget CONSTANT)
-
 public:
     explicit FileProviderSettingsController(QObject *parent = nullptr);
 
diff --git a/src/gui/macOS/ui/fileprovidersettingscontroller.cpp b/src/gui/macOS/ui/fileprovidersettingscontroller_mac.mm
similarity index 87%
rename from src/gui/macOS/ui/fileprovidersettingscontroller.cpp
rename to src/gui/macOS/ui/fileprovidersettingscontroller_mac.mm
index 4509a74a2f..7578171cd7 100644
--- a/src/gui/macOS/ui/fileprovidersettingscontroller.cpp
+++ b/src/gui/macOS/ui/fileprovidersettingscontroller_mac.mm
@@ -19,16 +19,15 @@
 #include "gui/systray.h"
 
 namespace {
-
 constexpr auto fpSettingsQmlPath = "qrc:/qml/src/gui/macOS/ui/FileProviderSettings.qml";
-
-}
+} // namespace
 
 namespace OCC {
 
 namespace Mac {
 
-Q_LOGGING_CATEGORY(lcFileProviderSettingsController, "nextcloud.gui.mac.fileprovider.settingscontroller")
+Q_LOGGING_CATEGORY(lcFileProviderSettingsController,
+                   "nextcloud.gui.mac.fileprovider.settingscontroller")
 
 FileProviderSettingsController::FileProviderSettingsController(QObject *parent)
     : QObject{parent}
@@ -43,6 +42,6 @@ QQuickWidget *FileProviderSettingsController::settingsViewWidget()
     return _settingsViewWidget.get();
 }
 
-} // Mac
+} // namespace Mac
 
-} // OCC
+} // namespace OCC