fix compilation issues on windows

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · Apr 10, 2024 · e1910a8 · e1910a8
1 parent 2f0aec4
commit e1910a8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -129,7 +129,7 @@ namespace {
 #ifdef Q_OS_WIN
 class WindowsNativeEventFilter : public QAbstractNativeEventFilter {
 public:
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override {
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override {
         const auto msg = static_cast<MSG *>(message);
         if(msg->message == WM_SYSCOLORCHANGE || msg->message == WM_SETTINGCHANGE) {
             if (const auto ptr = qobject_cast<QGuiApplication *>(QGuiApplication::instance())) {

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
@@ -933,11 +933,13 @@ QVariantMap Theme::systemPalette()
 {
     connectToPaletteSignal();
 #if defined(Q_OS_WIN)
+    auto systemPalette = QGuiApplication::palette();
     if(darkMode()) {
-        return reserveDarkPalette;
+        systemPalette = reserveDarkPalette;
     }
-#endif
+#else
     const auto systemPalette = QGuiApplication::palette();
+#endif
 
     return QVariantMap {
         { QStringLiteral("base"), systemPalette.base().color() },

diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp
@@ -29,9 +29,9 @@
 #include <QUuid>
 
 #include <sddl.h>
+#include <ntstatus.h>
 #include <cfapi.h>
 #include <comdef.h>
-#include <ntstatus.h>
 
 #include "config.h"
 

diff --git a/src/libsync/vfs/cfapi/vfs_cfapi.cpp b/src/libsync/vfs/cfapi/vfs_cfapi.cpp
@@ -24,6 +24,7 @@
 #include "common/syncjournaldb.h"
 #include "config.h"
 
+#include <ntstatus.h>
 #include <cfapi.h>
 #include <comdef.h>