From 2b5c8b605977ae366b39eac5188ba4eb4e5b1408 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 29 Oct 2022 21:39:43 +0200
Subject: [PATCH] Use `qEnvironmentVariable` via compat header from qtutilities

---
 connector/syncthingconfig.cpp       |  8 +++-----
 widgets/CMakeLists.txt              |  2 +-
 widgets/settings/settingsdialog.cpp | 13 ++-----------
 widgets/settings/setupdetection.cpp | 12 +++---------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/connector/syncthingconfig.cpp b/connector/syncthingconfig.cpp
index bd51ce0..e66f8bc 100644
--- a/connector/syncthingconfig.cpp
+++ b/connector/syncthingconfig.cpp
@@ -3,6 +3,8 @@
 
 #include "resources/config.h"
 
+#include <qtutilities/misc/compat.h>
+
 #include <QFile>
 #include <QStandardPaths>
 #include <QXmlStreamReader>
@@ -17,14 +19,10 @@ namespace Data {
 
 QString SyncthingConfig::locateConfigFile()
 {
-    auto
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-        path
-        = qEnvironmentVariable(PROJECT_VARNAME_UPPER "_SYNCTHING_CONFIG_DIR");
+    auto path = qEnvironmentVariable(PROJECT_VARNAME_UPPER "_SYNCTHING_CONFIG_DIR");
     if (!path.isEmpty() && QFile::exists(path += QStringLiteral("/config.xml"))) {
         return path;
     }
-#endif
     path = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("syncthing/config.xml"));
     if (path.isEmpty()) {
         path = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("Syncthing/config.xml"));
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index 4f1a426..e2479b5 100644
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -89,7 +89,7 @@ find_package(${PACKAGE_NAMESPACE_PREFIX}c++utilities${CONFIGURATION_PACKAGE_SUFF
 use_cpp_utilities(VISIBILITY PUBLIC)
 
 # find qtutilities
-find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.9.0 REQUIRED)
+find_package(${PACKAGE_NAMESPACE_PREFIX}qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES} 6.10.0 REQUIRED)
 use_qt_utilities()
 
 # find backend libraries
diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp
index 3d99214..c407270 100644
--- a/widgets/settings/settingsdialog.cpp
+++ b/widgets/settings/settingsdialog.cpp
@@ -4,6 +4,8 @@
 
 #include "../misc/syncthinglauncher.h"
 
+#include <qtutilities/misc/compat.h>
+
 #include <syncthingconnector/syncthingconfig.h>
 #include <syncthingconnector/syncthingconnection.h>
 #include <syncthingconnector/syncthingprocess.h>
@@ -771,17 +773,6 @@ bool isAutostartEnabled()
 #endif
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
-/*!
- * \brief Provides a fallback for qEnvironmentVariable() when using old Qt versions.
- */
-static QString qEnvironmentVariable(const char *varName, const QString &defaultValue)
-{
-    const auto val(qgetenv(varName));
-    return !val.isEmpty() ? QString::fromLocal8Bit(val) : defaultValue;
-}
-#endif
-
 /*!
  * \brief Sets whether the application is launchedc on startup.
  * \remarks
diff --git a/widgets/settings/setupdetection.cpp b/widgets/settings/setupdetection.cpp
index 3c09e60..374020d 100644
--- a/widgets/settings/setupdetection.cpp
+++ b/widgets/settings/setupdetection.cpp
@@ -4,6 +4,8 @@
 // use meta-data of syncthingtray application here
 #include "resources/../../tray/resources/config.h"
 
+#include <qtutilities/misc/compat.h>
+
 #if defined(LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD) && (defined(PLATFORM_UNIX) || defined(PLATFORM_MINGW) || defined(PLATFORM_CYGWIN))
 #define PLATFORM_HAS_GETLOGIN
 #include <unistd.h>
@@ -15,15 +17,7 @@ SetupDetection::SetupDetection(QObject *parent)
     : QObject(parent)
 {
     // assume default service names
-    const auto defaultUserUnit =
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-        qEnvironmentVariable(PROJECT_VARNAME_UPPER "_SYSTEMD_USER_UNIT",
-#endif
-            QStringLiteral("syncthing.service")
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-        )
-#endif
-        ;
+    const auto defaultUserUnit = qEnvironmentVariable(PROJECT_VARNAME_UPPER "_SYSTEMD_USER_UNIT", QStringLiteral("syncthing.service"));
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
     userService.setUnitName(defaultUserUnit);
     systemService.setUnitName(QStringLiteral("syncthing@") %