From 3581f1b724997227dc2a5183e1fbe729c3b3cc1c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 25 Apr 2023 09:08:51 +0200
Subject: [PATCH 1/3] fix msvc build

---
 apps/opencs/editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 7e9abcf4da..65ee003724 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -45,7 +45,7 @@ CS::Editor::Editor(int argc, char** argv)
     , mSettingsState(mCfgMgr)
     , mDocumentManager(mCfgMgr)
     , mPid(std::filesystem::temp_directory_path() / "openmw-cs.pid")
-    , mLockFile(QFileInfo(mPid.c_str()).absoluteFilePath() + ".lock")
+    , mLockFile(QFileInfo(QString::fromStdString(mPid.string())).absoluteFilePath() + ".lock")
     , mMerge(mDocumentManager)
     , mIpcServerName("org.openmw.OpenCS")
     , mServer(nullptr)

From afc4e064cba8f4387aa3c8834e483e157ff55d14 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 25 Apr 2023 10:34:29 +0200
Subject: [PATCH 2/3] make use of pathToUnicodeString

---
 apps/opencs/editor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 65ee003724..f4ddd9f254 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -30,6 +30,7 @@
 #include <components/esm3/loadtes3.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
+#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
@@ -45,7 +46,7 @@ CS::Editor::Editor(int argc, char** argv)
     , mSettingsState(mCfgMgr)
     , mDocumentManager(mCfgMgr)
     , mPid(std::filesystem::temp_directory_path() / "openmw-cs.pid")
-    , mLockFile(QFileInfo(QString::fromStdString(mPid.string())).absoluteFilePath() + ".lock")
+    , mLockFile(QFileInfo(QString::fromStdString(Files::pathToUnicodeString(mPid))).absoluteFilePath() + ".lock")
     , mMerge(mDocumentManager)
     , mIpcServerName("org.openmw.OpenCS")
     , mServer(nullptr)

From 249986b6e026a29fd7c9f715f136bb748158f957 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 25 Apr 2023 11:21:16 +0200
Subject: [PATCH 3/3] pathToQString makes things shorter

---
 apps/opencs/editor.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index f4ddd9f254..82a3c6e2f5 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -30,7 +30,6 @@
 #include <components/esm3/loadtes3.hpp>
 #include <components/fallback/fallback.hpp>
 #include <components/fallback/validate.hpp>
-#include <components/files/conversion.hpp>
 #include <components/files/qtconversion.hpp>
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
@@ -46,7 +45,7 @@ CS::Editor::Editor(int argc, char** argv)
     , mSettingsState(mCfgMgr)
     , mDocumentManager(mCfgMgr)
     , mPid(std::filesystem::temp_directory_path() / "openmw-cs.pid")
-    , mLockFile(QFileInfo(QString::fromStdString(Files::pathToUnicodeString(mPid))).absoluteFilePath() + ".lock")
+    , mLockFile(QFileInfo(Files::pathToQString(mPid)).absoluteFilePath() + ".lock")
     , mMerge(mDocumentManager)
     , mIpcServerName("org.openmw.OpenCS")
     , mServer(nullptr)