From be01bdd6f901bb88c37adcf5026f9c378456dc72 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 24 Mar 2019 18:44:03 +1100
Subject: [PATCH] use qt's OS macros

---
 effects/effectloaders.cpp    |  2 +-
 effects/internal/vsthost.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/effects/effectloaders.cpp b/effects/effectloaders.cpp
index fd012a227..83fdc5b64 100644
--- a/effects/effectloaders.cpp
+++ b/effects/effectloaders.cpp
@@ -246,7 +246,7 @@ void load_frei0r_effects() {
   QList<QString> effect_dirs = get_effects_paths();
 
   // add defined paths for frei0r plugins on unix
-#if defined(__APPLE__) || defined(__linux__) || defined(__HAIKU__)
+#if defined(Q_OS_MACOS) || defined(Q_OS_LINUX) || defined(__HAIKU__)
   effect_dirs.prepend("/usr/lib/frei0r-1");
   effect_dirs.prepend("/usr/local/lib/frei0r-1");
   effect_dirs.prepend(QDir::homePath() + "/.frei0r-1/lib");
diff --git a/effects/internal/vsthost.cpp b/effects/internal/vsthost.cpp
index 09ed8b593..2958832f1 100644
--- a/effects/internal/vsthost.cpp
+++ b/effects/internal/vsthost.cpp
@@ -36,12 +36,12 @@
 
 // Load libraries for retrieving the native window handle. Used for VST plugins that have a separate window
 // dedicated to controls.
-#if defined(_WIN32)
+#if defined(Q_OS_WIN)
 #include <Windows.h>
-#elif defined(__APPLE__)
+#elif defined(Q_OS_MACOS)
 #include <CoreFoundation/CoreFoundation.h>
 class NSWindow;
-#elif defined(__linux__)
+#elif defined(Q_OS_LINUX)
 #include <X11/X.h>
 #endif
 
@@ -337,11 +337,11 @@ void VSTHost::show_interface(bool show) {
   dialog->setVisible(show);
 
   if (show) {
-#if defined(_WIN32)
+#if defined(Q_OS_WIN)
     dispatcher(plugin, effEditOpen, 0, 0, reinterpret_cast<HWND>(dialog->windowHandle()->winId()), 0);
-#elif defined(__APPLE__)
+#elif defined(Q_OS_MACOS)
     dispatcher(plugin, effEditOpen, 0, 0, reinterpret_cast<NSWindow*>(dialog->windowHandle()->winId()), 0);
-#elif defined(__linux__) || defined(__HAIKU__)
+#elif defined(Q_OS_LINUX) || defined(__HAIKU__)
     dispatcher(plugin, effEditOpen, 0, 0, reinterpret_cast<void*>(dialog->windowHandle()->winId()), 0);
 #endif
   } else {