From 7d119457db519279fa218ef683ccd127ba8678ea Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 30 Nov 2022 15:25:42 +0100
Subject: [PATCH] Move file provider components to macOS folder

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 src/gui/CMakeLists.txt                  | 4 +++-
 src/gui/{ => macOS}/fileprovider.h      | 2 +-
 src/gui/{ => macOS}/fileprovider_mac.mm | 2 +-
 src/gui/main.cpp                        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/gui/{ => macOS}/fileprovider.h (97%)
 rename src/gui/{ => macOS}/fileprovider_mac.mm (99%)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 5c4904d115..7374b41ec5 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -280,7 +280,9 @@ endif()
 IF( APPLE )
     list(APPEND client_SRCS cocoainitializer_mac.mm)
     list(APPEND client_SRCS systray.mm)
-    list(APPEND client_SRCS fileprovider_mac.mm)
+    list(APPEND client_SRCS
+        macOS/fileprovider.h
+        macOS/fileprovider_mac.mm)
 
     if(SPARKLE_FOUND AND BUILD_UPDATER)
         # Define this, we need to check in updater.cpp
diff --git a/src/gui/fileprovider.h b/src/gui/macOS/fileprovider.h
similarity index 97%
rename from src/gui/fileprovider.h
rename to src/gui/macOS/fileprovider.h
index 296ebc551e..fc169f2991 100644
--- a/src/gui/fileprovider.h
+++ b/src/gui/macOS/fileprovider.h
@@ -18,7 +18,7 @@
 #include <QObject>
 #include <QScopedPointer>
 
-#include "accountstate.h"
+#include "gui/accountstate.h"
 
 namespace OCC {
 namespace Mac {
diff --git a/src/gui/fileprovider_mac.mm b/src/gui/macOS/fileprovider_mac.mm
similarity index 99%
rename from src/gui/fileprovider_mac.mm
rename to src/gui/macOS/fileprovider_mac.mm
index 4f2669ffa8..540a662d78 100644
--- a/src/gui/fileprovider_mac.mm
+++ b/src/gui/macOS/fileprovider_mac.mm
@@ -16,7 +16,7 @@
 #import <Foundation/Foundation.h>
 #import <FileProvider/FileProvider.h>
 
-#include "application.h"
+#include "gui/application.h"
 #include "fileprovider.h"
 
 namespace OCC {
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 7ab8c99418..8542993c99 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #ifdef Q_OS_MACOS
-#include "fileprovider.h"
+#include "macOS/fileprovider.h"
 #endif
 
 #include "application.h"